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

Import Geant4 3.0.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-08 15:55:53 +02:00
parent e7d7193284
commit cfcb558cfe
3050 changed files with 91703 additions and 48310 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/persistency/History
+13
View File
@@ -15,6 +15,19 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
15 December, 00 Y.Morita (persistency-V02-00-03)
- added more SRM comments
5 December, 00 Y.Morita (persistency-V02-00-02)
- added SRM comments to some classes
17 November, 00 Y.Morita (persistency-V02-00-01)
- more workaround on G4PGeometryObjectMap for ooddlx
2 November, 00 Y.Morita (persistency-V02-00-00)
- created global/include/G4Pglobals.hh
- workaround to protect old ooddlx from new STL syntax.
9 June, 00 Y.Morita (persistency-V01-00-02)
- added material in G4PersistentGeomMan::Retrieve()
source/persistency/digits+hits/digits/include/G4PDCofThisEvent.ddl
+25 -5
View File
@@ -5,8 +5,21 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4PDCofThisEvent.ddl,v 1.3 1999/12/02 16:10:19 morita Exp $
// GEANT4 tag $Name: geant4-02-00 $
// $Id: G4PDCofThisEvent.ddl,v 1.4 2000/12/15 08:04:13 morita Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// Class Description:
// This is a persistent version of container class which stores
// the associations to the digi collection in one event.
// User should check the existence of the instance of this class
// in his/her sensitive detector class with GetCurrentPDCofThisEvent()
// method of a singleton class G4PersistentDigitMan. If it does
// not exist, use should create a new instance and register the smart
// pointer with SetCurrentPDCofThisEvent() method of G4PersistentDigitMan.
// As user creates a new collection of digit, its smart pointer should
// be registered to this class via AddDigitsCollection().
// To obtain a smart pointer of the i-th collection, use GetDC() method.
//
#ifndef G4PDCofThisEvent_h
@@ -21,18 +34,25 @@
class G4PDCofThisEvent
: public HepPersObj
{
public:
public: // with description
G4PDCofThisEvent();
// Constructor.
~G4PDCofThisEvent();
// Destructor.
void AddDigitsCollection(G4int DCID, HepRef(G4PVDigitsCollection) aDC);
// Store a smart pointer of the collection aDC as DCID-th entry.
private:
d_Varray< d_Ref<G4PVDigitsCollection> > DC;
public:
public: // with description
inline HepRef(G4PVDigitsCollection) GetDC(G4int i)
{ return DC[i]; }
// Returns a smart pointer of a digit collection at the index i.
// Null will be returned if the particular collection is not stored
// in the current event.
public:
inline G4int GetCapacity()
{ return DC.size(); }
inline G4int GetNumberOfCollections()
source/persistency/digits+hits/digits/include/G4PVDigit.ddl
+13 -3
View File
@@ -5,8 +5,14 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4PVDigit.ddl,v 1.2 1999/11/24 20:28:06 morita Exp $
// GEANT4 tag $Name: geant4-02-00 $
// $Id: G4PVDigit.ddl,v 1.3 2000/12/15 08:04:13 morita Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// Class Description:
// This is a persistent version of abstract base class of a detector
// digit. User should inherit from this class for his/her sensitive
// detector digit, to be added to the correponding digits collection.
//
#ifndef G4PVDigit_h
@@ -22,9 +28,13 @@ class G4PVDigit
: public HepPersObj, public G4VDigi
{
public:
public: // with description
G4PVDigit();
// Constructor.
virtual ~G4PVDigit();
// (Virtual) destructor.
public:
int operator==(const G4PVDigit &right) const;
virtual void Draw();
virtual void Print();
source/persistency/digits+hits/digits/include/G4PVDigitsCollection.ddl
+21 -6
View File
@@ -5,14 +5,25 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4PVDigitsCollection.ddl,v 1.4 1999/12/01 14:45:10 morita Exp $
// GEANT4 tag $Name: geant4-02-00 $
// $Id: G4PVDigitsCollection.ddl,v 1.6 2000/12/15 08:04:13 morita Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// Class Description:
// This is a persistent version of container class which stores
// the associations to the digits of one sensitive detector.
// User should inherit his/her own persistent digits collection
// from this class to store user derived digits.
// At the end of each event, user sensitive detector should
// create a new collection with a detector name and a collection
// name. Comparison operator and GetName(), GetSDName() are
// provided.
//
#ifndef G4PVDigitsCollection_h
#define G4PVDigitsCollection_h 1
#include "globals.hh"
#include "G4Pglobals.hh"
#include "G4PersistentTypes.hh"
#include "G4PersistentSchema.hh"
@@ -21,22 +32,26 @@
class G4PVDigitsCollection
: public HepPersObj
{
public:
public: // with description
G4PVDigitsCollection(G4String detName,G4String colNam);
// Constructor.
~G4PVDigitsCollection();
// Destructor.
int operator==(const G4PVDigitsCollection &right) const;
// Comparison with detName and colNam.
protected:
// Persistent Collection name
G4PString pcollectionName;
G4PString pDMname;
public:
public: // with description
inline G4String GetName()
{ return (G4String) pcollectionName; }
// returns the collection name.
inline G4String GetDMname()
{ return (G4String) pDMname; }
// returns the detector name.
};
source/persistency/digits+hits/digits/include/G4PersistentDigitMan.hh
+15 -5
View File
@@ -5,10 +5,11 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4PersistentDigitMan.hh,v 1.6 1999/11/29 20:11:16 morita Exp $
// GEANT4 tag $Name: geant4-02-00 $
// $Id: G4PersistentDigitMan.hh,v 1.7 2000/12/15 08:04:13 morita Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// class G4PersistentDigitMan
// Class Description:
//
// A Class responsible for registring DigitsCollection
// during event tracking.
@@ -18,6 +19,7 @@
//
// This class itself is not persistent-capable.
//
// Member functions:
// =================
// static G4PersistentDigitMan* GetPersistentDigitMan();
@@ -48,10 +50,13 @@
class G4PersistentDigitMan
: public G4VPersistentSubMan, public G4VPersistentSubDbMan
{
public:
public: // with description
static G4PersistentDigitMan* GetPersistentDigitMan();
// returns a pointer to singleton instance of this class.
static G4PersistentDigitMan* get_PersistentDigitManIfExist();
// returns a pointer to singleton instance of this class.
public:
G4PersistentDigitMan();
~G4PersistentDigitMan();
@@ -59,11 +64,16 @@ class G4PersistentDigitMan
static G4PersistentDigitMan * f_PersistentDigitMan;
HepRef(G4PDCofThisEvent) f_CurrentPDCofThisEvent;
public:
public: // with description
inline void SetCurrentPDCofThisEvent( HepRef(G4PDCofThisEvent) aPDC)
{ f_CurrentPDCofThisEvent = aPDC; };
// sets a smart pointer of the collection of digits collections
// of this event. This method should be invoked by user
// sensitive detector only once per event.
inline HepRef(G4PDCofThisEvent) GetCurrentPDCofThisEvent()
{ return f_CurrentPDCofThisEvent; };
// returns a smart pointer of the collection of digits collections
// of this event.
};
source/persistency/digits+hits/digits/src/G4PDCofThisEvent.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PDCofThisEvent.cc,v 1.3 1999/12/02 16:10:20 morita Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
#include "G4PDCofThisEvent.hh"
source/persistency/digits+hits/digits/src/G4PVDigit.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PVDigit.cc,v 1.2 1999/11/24 20:28:07 morita Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
#include "G4PVDigit.hh"
source/persistency/digits+hits/digits/src/G4PVDigitsCollection.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PVDigitsCollection.cc,v 1.3 1999/11/29 20:11:17 morita Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// G4PVDigitsCollection
source/persistency/digits+hits/digits/src/G4PersistentDigitMan.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PersistentDigitMan.cc,v 1.4 1999/11/28 21:54:14 morita Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// class G4PersistentDigitMan
//
source/persistency/digits+hits/hits/include/G4PHCofThisEvent.ddl
+25 -5
View File
@@ -5,8 +5,21 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4PHCofThisEvent.ddl,v 1.8 1999/12/02 16:10:21 morita Exp $
// GEANT4 tag $Name: geant4-02-00 $
// $Id: G4PHCofThisEvent.ddl,v 1.9 2000/12/15 08:04:14 morita Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// Class Description:
// This is a persistent version of container class which stores
// the associations to the hit collection in one event.
// User should check the existence of the instance of this class
// in his/her sensitive detector class with GetCurrentPHCofThisEvent()
// method of a singleton class G4PersistentHitMan. If it does
// not exist, use should create a new instance and register the smart
// pointer with SetCurrentPHCofThisEvent() method of G4PersistentHitMan.
// As user creates a new collection of hit, its smart pointer should
// be registered to this class via AddHitsCollection().
// To obtain a smart pointer of the i-th collection, use GetHC() method.
//
#ifndef G4PHCofThisEvent_h
@@ -21,18 +34,25 @@
class G4PHCofThisEvent
: public HepPersObj
{
public:
public: // with description
G4PHCofThisEvent();
// Constructor.
~G4PHCofThisEvent();
// Destructor.
void AddHitsCollection(G4int HCID, HepRef(G4PVHitsCollection) aHC);
// Store a smart pointer of the collection aHC as HCID-th entry.
private:
d_Varray< d_Ref<G4PVHitsCollection> > HC;
public:
public: // with description
inline HepRef(G4PVHitsCollection) GetHC(G4int i)
{ return HC[i]; }
// Returns a smart pointer of a hit collection at the index i.
// Null will be returned if the particular collection is not stored
// in the current event.
public:
inline G4int GetCapacity()
{ return HC.size(); }
inline G4int GetNumberOfCollections()
source/persistency/digits+hits/hits/include/G4PVHit.ddl
+13 -3
View File
@@ -5,8 +5,14 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4PVHit.ddl,v 1.6 1999/11/24 20:27:24 morita Exp $
// GEANT4 tag $Name: geant4-02-00 $
// $Id: G4PVHit.ddl,v 1.7 2000/12/15 08:04:14 morita Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// Class Description:
// This is a persistent version of abstract base class of a detector
// digit. User should inherit from this class for his/her sensitive
// detector digit, to be added to the correponding digits collection.
//
#ifndef G4PVHit_h
@@ -22,9 +28,13 @@ class G4PVHit
: public HepPersObj, public G4VHit
{
public:
public: // with description
G4PVHit();
// Constructor.
virtual ~G4PVHit();
// (Virtual) destructor.
public:
int operator==(const G4PVHit &right) const;
virtual void Draw();
virtual void Print();
source/persistency/digits+hits/hits/include/G4PVHitsCollection.ddl
+21 -5
View File
@@ -5,14 +5,25 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4PVHitsCollection.ddl,v 1.12 1999/12/01 14:45:13 morita Exp $
// GEANT4 tag $Name: geant4-02-00 $
// $Id: G4PVHitsCollection.ddl,v 1.14 2000/12/15 08:04:14 morita Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// Class Description:
// This is a persistent version of container class which stores
// the associations to the hits of one sensitive detector.
// User should inherit his/her own persistent hits collection
// from this class to store user derived hits.
// At the end of each event, user sensitive detector should
// create a new collection with a detector name and a collection
// name. Comparison operator and GetName(), GetSDName() are
// provided.
//
#ifndef G4PVHitsCollection_h
#define G4PVHitsCollection_h 1
#include "globals.hh"
#include "G4Pglobals.hh"
#include "G4PersistentTypes.hh"
#include "G4PersistentSchema.hh"
@@ -21,10 +32,13 @@
class G4PVHitsCollection
: public HepPersObj
{
public:
public: // with description
G4PVHitsCollection(G4String detName,G4String colNam);
// Constructor.
~G4PVHitsCollection();
// Destructor.
int operator==(const G4PVHitsCollection &right) const;
// Comparison with detName and colName.
protected:
@@ -32,11 +46,13 @@ class G4PVHitsCollection
G4PString pcollectionName;
G4PString pSDname;
public:
public: // with description
inline G4String GetName()
{ return (G4String) pcollectionName; }
// returns the collection name.
inline G4String GetSDname()
{ return (G4String) pSDname; }
// returns the detector name.
};
source/persistency/digits+hits/hits/include/G4PersistentHitMan.hh
+15 -5
View File
@@ -5,10 +5,11 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4PersistentHitMan.hh,v 1.5 1999/11/28 21:54:15 morita Exp $
// GEANT4 tag $Name: geant4-02-00 $
// $Id: G4PersistentHitMan.hh,v 1.6 2000/12/15 08:04:14 morita Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// class G4PersistentHitMan
// Class Description:
//
// A Class responsible for registring HitsCollection
// during event tracking.
@@ -18,6 +19,7 @@
//
// This class itself is not persistent-capable.
//
// Member functions:
// =================
// static G4PersistentHitMan* GetPersistentHitMan();
@@ -48,10 +50,13 @@
class G4PersistentHitMan
: public G4VPersistentSubMan, public G4VPersistentSubDbMan
{
public:
public: // with description
static G4PersistentHitMan* GetPersistentHitMan();
// returns a pointer to singleton instance of this class.
static G4PersistentHitMan* get_PersistentHitManIfExist();
// returns a pointer to singleton instance of this class.
public:
G4PersistentHitMan();
~G4PersistentHitMan();
@@ -59,11 +64,16 @@ class G4PersistentHitMan
static G4PersistentHitMan * f_PersistentHitMan;
HepRef(G4PHCofThisEvent) f_CurrentPHCofThisEvent;
public:
public: // with description
inline void SetCurrentPHCofThisEvent( HepRef(G4PHCofThisEvent) aPHC)
{ f_CurrentPHCofThisEvent = aPHC; };
// sets a smart pointer of the collection of hits collections
// of this event. This method should be invoked by user
// sensitive detector only once per event.
inline HepRef(G4PHCofThisEvent) GetCurrentPHCofThisEvent()
{ return f_CurrentPHCofThisEvent; };
// returns a smart pointer of the collection of hits collections
// of this event.
};
source/persistency/digits+hits/hits/src/G4PHCofThisEvent.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PHCofThisEvent.cc,v 1.6 1999/12/02 16:10:22 morita Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
#include "G4PHCofThisEvent.hh"
source/persistency/digits+hits/hits/src/G4PVHit.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PVHit.cc,v 1.4 1999/11/24 20:27:24 morita Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
#include "G4PVHit.hh"
source/persistency/digits+hits/hits/src/G4PVHitsCollection.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PVHitsCollection.cc,v 1.8 1999/11/28 21:54:16 morita Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// G4PVHitsCollection
source/persistency/digits+hits/hits/src/G4PersistentHitMan.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PersistentHitMan.cc,v 1.4 1999/11/28 21:54:16 morita Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// class G4PersistentHitMan
//
source/persistency/events/include/G4PEvent.ddl
+28 -5
View File
@@ -5,14 +5,26 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4PEvent.ddl,v 1.8 1999/11/28 21:54:17 morita Exp $
// GEANT4 tag $Name: geant4-02-00 $
// $Id: G4PEvent.ddl,v 1.10 2000/12/05 14:40:02 morita Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// Class Description:
//
// This is a class which represent a persistent event in Geant4.
// A persistent event object is constructed by
// G4PersistentEventMan::Store() or read back from a database
// by G4PersistentEventMan::Retrieve().
// G4PersistentEventMan::Store() passes a pointer of a transient
// G4Event object. The G4PEvent object construct itself by copying
// the data member of G4Event, and by creating corresponting
// persistent objects of primary vertex, particles, hits and digits.
//
#ifndef G4PEvent_h
#define G4PEvent_h 1
#include "globals.hh"
#include "G4Pglobals.hh"
#include "G4PersistentTypes.hh"
#include "G4PersistentSchema.hh"
@@ -29,16 +41,19 @@ class G4PEvent
: public HepPersObj
{
public:
public: // with description
G4PEvent();
G4PEvent(const G4Event *evt);
G4PEvent(const G4Event *evt,
HepRef(G4PHCofThisEvent) pHC,
HepRef(G4PDCofThisEvent) pDC);
// Constructors.
void InitPEvent(const G4Event *evt,
HepRef(G4PHCofThisEvent) pHC,
HepRef(G4PDCofThisEvent) pDC);
// Actual constructor to be called by the above.
~G4PEvent();
// Destructor.
private:
// event ID
@@ -57,10 +72,11 @@ class G4PEvent
// TrajectoryContainer (not supported yet)
// d_Ref<G4PTrajectoryContainer> trajectoryContainer;
public:
public: // with description
void SetEventID(const G4Event *evt);
inline G4int GetEventID() const
{ return eventID; }
// Set and get event ID.
inline void AddPrimaryVertex( HepRef(G4PPrimaryVertex) aPrimaryVertex)
{
@@ -70,9 +86,11 @@ class G4PEvent
{ thePrimaryVertex->SetNext( aPrimaryVertex ); }
numberOfPrimaryVertex++;
}
// Adds another primary vertex to the vertex chain.
inline G4int GetNumberOfPrimaryVertex() const
{ return numberOfPrimaryVertex; }
// Get the number of primary vertecies in the chain.
inline HepRef(G4PPrimaryVertex) GetPrimaryVertex(G4int i=0) const
{
@@ -91,16 +109,19 @@ class G4PEvent
else
{ return NULL; }
}
// returns a smart pointer of the i-th primary vertex.
inline void SetHCofThisEvent( HepRef(G4PHCofThisEvent) value)
{ HC = value; }
inline HepRef(G4PHCofThisEvent) GetHCofThisEvent() const
{ return HC; }
// Sets and gets a smart pointer of the hits collections of this event.
inline void SetDCofThisEvent( HepRef(G4PDCofThisEvent) value)
{ DC = value; }
inline HepRef(G4PDCofThisEvent) GetDCofThisEvent() const
{ return DC; }
// Sets and gets a smart pointer of the digits collections of this event.
// inline void SetTrajectoryContainer(G4TrajectoryContainer*value)
// { trajectoryContainer = value; }
@@ -108,6 +129,8 @@ class G4PEvent
// { return trajectoryContainer; }
G4Event* MakeTransientObject();
// Construct a transient G4Event object from the data members of
// G4PEvent.
};
source/persistency/events/include/G4PPrimaryParticle.ddl
+3 -3
View File
@@ -5,14 +5,14 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4PPrimaryParticle.ddl,v 1.1 1999/12/05 22:32:25 morita Exp $
// GEANT4 tag $Name: geant4-02-00 $
// $Id: G4PPrimaryParticle.ddl,v 1.2 2000/11/02 12:41:59 morita Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
#ifndef G4PPrimaryParticle_h
#define G4PPrimaryParticle_h 1
#include "globals.hh"
#include "G4Pglobals.hh"
#include "G4ThreeVector.hh"
#include "G4PersistentTypes.hh"
#include "G4PersistentSchema.hh"
source/persistency/events/include/G4PPrimaryVertex.ddl
+14 -7
View File
@@ -5,16 +5,21 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4PPrimaryVertex.ddl,v 1.7 1999/12/05 22:32:26 morita Exp $
// GEANT4 tag $Name: geant4-02-00 $
// $Id: G4PPrimaryVertex.ddl,v 1.9 2000/12/05 14:40:02 morita Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// Class Description:
// This is a class which represent a persistent primary vertex
// in Geant4. It is constructed by a G4PEvent object with a pointer
// of transient G4PrimaryVertex object.
//
#ifndef G4PPrimaryVertex_h
#define G4PPrimaryVertex_h 1
#include "globals.hh"
#include "G4Pglobals.hh"
#include "G4ThreeVector.hh"
#include "G4PersistentTypes.hh"
#include "G4PersistentSchema.hh"
@@ -28,12 +33,14 @@ class G4PPrimaryParticle;
class G4PPrimaryVertex
: public HepPersObj
{
public:
public: // with description
G4PPrimaryVertex();
G4PPrimaryVertex(const G4PrimaryVertex* vertex);
~G4PPrimaryVertex();
// Constructors and destructor.
G4PrimaryVertex* MakeTransientObject();
// Creates a transient primary vertex object and returns the pointer.
private:
G4Pdouble X0;
@@ -45,7 +52,7 @@ class G4PPrimaryVertex
d_Ref<G4PPrimaryVertex> nextVertex;
G4Pint numberOfParticle;
public:
public: // with description
inline G4ThreeVector GetPosition() const
{ return G4ThreeVector(X0,Y0,Z0); }
inline G4double GetX0() const
@@ -58,9 +65,9 @@ class G4PPrimaryVertex
{ return T0; }
inline G4int GetNumberOfParticle() const
{ return numberOfParticle; }
// Get methods to read the vertex values.
HepRef(G4PPrimaryParticle) GetPrimary(G4int i) const;
inline void SetNext(HepRef(G4PPrimaryVertex) nv)
{
if(nextVertex == NULL)
@@ -68,9 +75,9 @@ class G4PPrimaryVertex
else
{ nextVertex->SetNext(nv); }
}
inline HepRef(G4PPrimaryVertex) GetNext() const
{ return nextVertex; }
// Set and Get methods to navigate thru the vertex chain.
};
source/persistency/events/include/G4PersistentEventMan.hh
+7 -5
View File
@@ -5,15 +5,17 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4PersistentEventMan.hh,v 1.9 1999/11/28 21:54:17 morita Exp $
// GEANT4 tag $Name: geant4-02-00 $
// $Id: G4PersistentEventMan.hh,v 1.11 2000/12/15 07:54:49 morita Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// class G4PersistentEventMan
//
// A Utility class for storing and retrieving the event objects.
// Class Description:
// A Utility class to be used by G4PersistencyManager.
// Average users do not need to use this class.
//
// This class is not persistent-capable.
//
// Member functions:
// =================
// G4bool Store(HepDbApplication* dbApp,
source/persistency/events/src/G4PEvent.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PEvent.cc,v 1.11 1999/12/15 14:51:20 gunter Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// G4PEvent
source/persistency/events/src/G4PPrimaryParticle.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PPrimaryParticle.cc,v 1.1 1999/12/05 22:32:26 morita Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
#include "G4PPrimaryParticle.hh"
source/persistency/events/src/G4PPrimaryVertex.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PPrimaryVertex.cc,v 1.7 1999/12/15 14:51:21 gunter Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
#include "G4PPrimaryVertex.hh"
source/persistency/events/src/G4PersistentEventMan.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PersistentEventMan.cc,v 1.15 1999/12/02 19:40:51 morita Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// class G4PersistentEventMan
//
source/persistency/geometry/global/include/G4PAffineTransform.ddl
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PAffineTransform.ddl,v 1.4 1999/12/15 14:51:22 gunter Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// persistenet class of G4AffineTransform
//
source/persistency/geometry/global/include/G4PVSolid.ddl
+3 -3
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4PVSolid.ddl,v 1.3 1999/12/15 14:51:22 gunter Exp $
// GEANT4 tag $Name: geant4-02-00 $
// $Id: G4PVSolid.ddl,v 1.4 2000/11/02 12:42:06 morita Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
//
// class G4PVSolid
@@ -18,7 +18,7 @@
#ifndef G4PVSOLID_DDL
#define G4PVSOLID_DDL
#include "globals.hh"
#include "G4Pglobals.hh"
#include "geomdefs.hh"
#include "G4PersistentTypes.hh"
#include "G4PersistentSchema.hh"
source/persistency/geometry/global/src/G4PAffineTransform.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PAffineTransform.cc,v 1.2 1999/12/15 14:51:22 gunter Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// class G4PAffineTransform
//
source/persistency/geometry/global/src/G4PVSolid.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PVSolid.cc,v 1.2 1999/12/15 14:51:22 gunter Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// class G4PVSolid
//
source/persistency/geometry/management/include/G4LogVolRefArray.hh
+60
View File
@@ -0,0 +1,60 @@
// 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 2000/11/17 05:10:02 morita Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// 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
+40 -49
View File
@@ -5,62 +5,38 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4PGeometryObjectMap.ddl,v 1.4 1999/12/15 14:51:23 gunter Exp $
// GEANT4 tag $Name: geant4-02-00 $
// $Id: G4PGeometryObjectMap.ddl,v 1.7 2000/11/22 15:29:39 morita Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// class G4PGeometryObjectMap
// class description:
//
// A Class responsible for keeping track of the geometry object map.
//
// This class is persistent-capable.
//
// Member functions:
// =================
// G4PGeometryObjectMap( G4PString theGeometryName );
// ~G4PGeometryObjectMap();
//
// protected:
// G4PVPhysicalVolume* LookUp( G4VPhysicalVolume* aPhysVol );
// void Add( const G4VPhysicalVolume* aPhysVol,
// const G4PVPhysicalVolume* persPhysVol );
// G4PLogicalVolume* LookUp(G4LogicalVolume* aLogVol);
// void Add( const G4LogicalVolume* aLogVol,
// const G4PLogicalVolume* persLogVol );
// G4PVSolid* LookUp(G4VSolid* aSolid);
// void Add( const G4VSolid* aSolid,
// const G4PVSolid* persSolid );
// G4int GetNoSolids();
// G4VSolid* GetSolid(G4int n);
// G4PVSolid* GetPSolid(G4int n);
// This is a class which is responsible for keeping track of the
// persistent geometry object in storing and retrieving geometry.
// This class inherits HepPersObj and is persistent-capable.
//
// Note:
// =====
// This class contains G4RWTPtrVector of the transient classes.
// As a result, ooddlx compiler will issue warnings as follows, but it's okay.
// The value of G4RWTPtrVector is used only in transient case
// This class contains pointers of some transient classes.
// As a result, ooddlx compiler will issue warnings as follows.
// The value of the pointers are used only in transient case
// in this class, and you can safely ignore these warnings.
// ----
// "include/G4PGeometryObjectMap.ddl", line xxx: warning: persistent-capable
// class member type is a problem
// The type of base class RWPtrVector is a problem
// The type of member RWPtrVector::array_ is pointer
// The type of base class G4RWTPtrVector<G4VPhysicalVolume > is a
// problem
// The type of base class RWPtrVector is a problem
// G4PhysVolRefVArray transPhysVolPtrs;
// ^
// "include/G4PGeometryObjectMap.ddl", line 136: warning: persistent-capable
// class member type is pointer
// G4VPhysVolRefArray* transPhysVolPtrs;
// ^
// ----
//
//
// History:
// 98.06.20 Y.Morita Initial version
#ifndef G4PGeometryObjectMap_h
#define G4PGeometryObjectMap_h 1
#include "g4rw/tpvector.h"
#include "G4Pglobals.hh"
#include "globals.hh"
#include "G4VPhysicalVolume.hh"
#include "G4LogicalVolume.hh"
#include "G4VSolid.hh"
@@ -75,9 +51,9 @@ class G4PLogicalVolume;
class G4PVSolid;
#pragma ooclassref G4PVSolid "G4PVSolid_ref.hh"
typedef G4RWTPtrVector<G4VPhysicalVolume> G4VPhysVolRefVArray;
typedef G4RWTPtrVector<G4LogicalVolume> G4LogVolRefVArray;
typedef G4RWTPtrVector<G4VSolid> G4VSolidRefVArray;
class G4VPhysVolRefArray;
class G4LogVolRefArray;
class G4VSolidRefArray;
typedef d_Varray< d_Ref<G4PVPhysicalVolume> > G4PVPhysVolRefVArray;
typedef d_Varray< d_Ref<G4PLogicalVolume> > G4PLogVolRefVArray;
@@ -88,19 +64,23 @@ class G4PGeometryObjectMap
{
public:
G4PGeometryObjectMap();
public: // with description
G4PGeometryObjectMap( const G4String theGeometryName );
~G4PGeometryObjectMap();
// The constructor and the destructor.
// template cannot be used in class scope!!
// template<class T_IN, class T_OUT> T_OUT LookUp( const T_IN aGeomObj );
public: // with description
HepRef(G4PVPhysicalVolume) LookUp( G4VPhysicalVolume* aPhysVol );
G4VPhysicalVolume* LookUp( HepRef(G4PVPhysicalVolume) aPhysVol );
HepRef(G4PLogicalVolume) LookUp( G4LogicalVolume* aLogVol);
G4LogicalVolume* LookUp( HepRef(G4PLogicalVolume) aLogVol);
HepRef(G4PVSolid) LookUp( G4VSolid* aSolid);
G4VSolid* LookUp( HepRef(G4PVSolid) persSolid);
// Method LookUp() will check if the pair of transient/persistent
// geometry objects is already registered in the geometry map.
// It returns the pointer of the pairing object if the pair exists.
public: // with description
void Add( G4VPhysicalVolume* aPhysVol,
HepRef(G4PVPhysicalVolume) persPhysVol );
void Add( HepRef(G4PVPhysicalVolume) persPhysVol,
@@ -113,19 +93,30 @@ class G4PGeometryObjectMap
HepRef(G4PVSolid) persSolid );
void Add( HepRef(G4PVSolid) persSolid,
G4VSolid* aSolid );
// Method Add() will register the transient and persistent geometry
// objects into the geometry map.
public: // with description
inline void SetWorldVolume( const HepRef(G4PVPhysicalVolume) aWorld )
{ thePersistentWorldVolume = aWorld; }
inline HepRef(G4PVPhysicalVolume) GetWorldVolume()
{ return thePersistentWorldVolume; }
// Set and Get methods for setting and getting a smart pointer
// for the persistent world volume of the geometry.
public: // with description
inline G4int GetNoPhysVol() const { return noPhysVol; }
inline G4int GetNoLogVol() const { return noLogVol; }
inline G4int GetNoSolids() const { return noSolids; }
// returns the number of the registered transient/persistent pairs
// in the geometry map.
public: // with description
G4VSolid* GetSolid(G4int n);
HepRef(G4PVSolid) GetPSolid(G4int n);
// returns the pointer of n-th transient/persistent solid.
public:
void InitTransientMap();
private:
@@ -134,17 +125,17 @@ class G4PGeometryObjectMap
// Physics Volume Pointer Array
G4Pint noPhysVol;
G4VPhysVolRefVArray transPhysVolPtrs;
G4VPhysVolRefArray* transPhysVolPtrs;
G4PVPhysVolRefVArray persPhysVolPtrs;
// Logical Volume Pointer Array
G4Pint noLogVol;
G4LogVolRefVArray transLogVolPtrs;
G4LogVolRefArray* transLogVolPtrs;
G4PLogVolRefVArray persLogVolPtrs;
// Solid Pointer Array
G4Pint noSolids;
G4VSolidRefVArray transSolidPtrs;
G4VSolidRefArray* transSolidPtrs;
G4PVSolidRefVArray persSolidPtrs;
};
source/persistency/geometry/management/include/G4PLogicalVolume.ddl
+3 -3
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4PLogicalVolume.ddl,v 1.8 2000/06/09 12:56:01 morita Exp $
// GEANT4 tag $Name: geant4-02-00 $
// $Id: G4PLogicalVolume.ddl,v 1.9 2000/11/02 12:42:11 morita Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
//
// class G4PLogicalVolume
@@ -15,7 +15,7 @@
#ifndef G4PLOGICALVOLUME_DDL
#define G4PLOGICALVOLUME_DDL 1
#include "globals.hh"
#include "G4Pglobals.hh"
#include "G4PersistentTypes.hh"
#include "G4PersistentSchema.hh"
#include "G4VMaterialMap.hh"
source/persistency/geometry/management/include/G4PPVParameterised.ddl
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PPVParameterised.ddl,v 1.4 1999/12/15 14:51:23 gunter Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// class G4PPVParameterised
//
source/persistency/geometry/management/include/G4PPVPlacement.ddl
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PPVPlacement.ddl,v 1.4 1999/12/15 14:51:23 gunter Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
//
// P-versieon of G4PVPlacement Takashi.Sasaki@kek.jp
source/persistency/geometry/management/include/G4PPVReplica.ddl
+5 -3
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4PPVReplica.ddl,v 1.4 1999/12/15 14:51:23 gunter Exp $
// GEANT4 tag $Name: geant4-02-00 $
// $Id: G4PPVReplica.ddl,v 1.5 2000/11/02 12:42:11 morita Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
//
// class G4PPVReplica
@@ -19,10 +19,12 @@
#ifndef G4PPVREPLICA_DDL
#define G4PPVREPLICA_DDL
#include "G4Pglobals.hh"
#include "G4PersistentTypes.hh"
#include "G4PersistentSchema.hh"
#include "G4VPhysicalVolume.hh"
#include "G4RotationMatrix.hh"
// #include "G4RotationMatrix.hh"
#include "G4PVPhysicalVolume.hh"
source/persistency/geometry/management/include/G4PVPhysicalVolume.ddl
+3 -3
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4PVPhysicalVolume.ddl,v 1.4 1999/12/15 14:51:23 gunter Exp $
// GEANT4 tag $Name: geant4-02-00 $
// $Id: G4PVPhysicalVolume.ddl,v 1.5 2000/11/02 12:42:11 morita Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
//
// class G4PVPhysicalVolume
@@ -14,7 +14,7 @@
#ifndef G4PVPHYSICALVOLUME_DDL
#define G4PVPHYSICALVOLUME_DDL 1
#include "globals.hh"
#include "G4Pglobals.hh"
#include "geomdefs.hh"
#include "G4PersistentTypes.hh"
#include "G4PersistentSchema.hh"
source/persistency/geometry/management/include/G4PersistentGeomMan.hh
+8 -6
View File
@@ -5,15 +5,17 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4PersistentGeomMan.hh,v 1.9 2000/06/09 12:56:01 morita Exp $
// GEANT4 tag $Name: geant4-02-00 $
// $Id: G4PersistentGeomMan.hh,v 1.10 2000/12/15 07:56:35 morita Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// class G4PersistentGeomMan
// Class Description:
// A Utility class to be used by G4PersistencyManager.
// Average users do not need to use this class.
//
// A Utility class for storing and retrieving the geometry objects.
//
// This class is not persistent-capable.
// This class is not persistent-capable.
//
// History:
// 98.10.30 Y.Morita Splited from G4PersistencyManager
source/persistency/geometry/management/include/G4VPhysVolRefArray.hh
+60
View File
@@ -0,0 +1,60 @@
// 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 2000/11/17 05:10:02 morita Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// 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
+60
View File
@@ -0,0 +1,60 @@
// 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 2000/11/17 05:10:03 morita Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// 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
+82 -35
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4PGeometryObjectMap.cc,v 1.5 1999/12/15 14:51:24 gunter Exp $
// GEANT4 tag $Name: geant4-02-00 $
// $Id: G4PGeometryObjectMap.cc,v 1.6 2000/11/17 05:10:03 morita Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// class G4PGeometryObjectMap
//
@@ -24,19 +24,31 @@
#include "G4PLogicalVolume.hh"
#include "G4PVSolid.hh"
#include "G4VPhysVolRefArray.hh"
#include "G4LogVolRefArray.hh"
#include "G4VSolidRefArray.hh"
G4PGeometryObjectMap::G4PGeometryObjectMap()
: noPhysVol(0),noLogVol(0),noSolids(0)
{
transPhysVolPtrs = new G4VPhysVolRefArray;
transLogVolPtrs = new G4LogVolRefArray;
transSolidPtrs = new G4VSolidRefArray;
}
G4PGeometryObjectMap::G4PGeometryObjectMap( const G4String theGeometryName )
: noPhysVol(0),noLogVol(0),noSolids(0)
{
noPhysVol = 0;
noLogVol = 0;
noSolids = 0;
transPhysVolPtrs = new G4VPhysVolRefArray;
transLogVolPtrs = new G4LogVolRefArray;
transSolidPtrs = new G4VSolidRefArray;
}
G4PGeometryObjectMap::~G4PGeometryObjectMap()
{
delete transPhysVolPtrs;
delete transLogVolPtrs;
delete transSolidPtrs;
}
// -------- LookUp() and Add() functions for each class -------- //
@@ -46,8 +58,12 @@ HepRef(G4PVPhysicalVolume) G4PGeometryObjectMap::LookUp(
{
assert(inGeomObj != NULL);
for(G4int i=0;i<noPhysVol;i++)
if( transPhysVolPtrs[i] == inGeomObj )
{
if( transPhysVolPtrs->Get(i) == inGeomObj )
{
return persPhysVolPtrs[i];
}
}
return NULL;
}
@@ -61,9 +77,9 @@ void G4PGeometryObjectMap::Add( G4VPhysicalVolume* inGeomObj,
{
// assert( inGeomObj == aGeomObj );
noPhysVol++;
transPhysVolPtrs.resize(noPhysVol);
transPhysVolPtrs[noPhysVol-1] = inGeomObj;
persPhysVolPtrs.insert_element(outGeomObj);
transPhysVolPtrs->Resize(noPhysVol);
transPhysVolPtrs->Insert(noPhysVol-1, inGeomObj);
persPhysVolPtrs.insert_element(outGeomObj);
}
}
@@ -74,8 +90,12 @@ G4VPhysicalVolume* G4PGeometryObjectMap::LookUp(
{
assert(inGeomObj != NULL);
for(G4int i=0;i<noPhysVol;i++)
{
if( persPhysVolPtrs[i] == inGeomObj )
return transPhysVolPtrs[i];
{
return transPhysVolPtrs->Get(i);
}
}
return NULL;
}
@@ -88,7 +108,7 @@ void G4PGeometryObjectMap::Add( HepRef(G4PVPhysicalVolume) inGeomObj,
{
if( persPhysVolPtrs[i] == inGeomObj )
{
transPhysVolPtrs[i] = outGeomObj;
transPhysVolPtrs->Insert(i, outGeomObj);
break;
}
G4cerr << "G4PGeometryObjectMap::Add -- transient solid not assigned" << G4endl;
@@ -102,8 +122,12 @@ HepRef(G4PLogicalVolume) G4PGeometryObjectMap::LookUp(
{
assert(inGeomObj != NULL);
for(G4int i=0;i<noLogVol;i++)
if( transLogVolPtrs[i] == inGeomObj )
{
if( transLogVolPtrs->Get(i) == inGeomObj )
{
return persLogVolPtrs[i];
}
}
return NULL;
}
@@ -117,9 +141,9 @@ void G4PGeometryObjectMap::Add( G4LogicalVolume* inGeomObj,
{
// assert( inGeomObj == aGeomObj );
noLogVol++;
transLogVolPtrs.resize(noLogVol);
transLogVolPtrs[noLogVol-1] = inGeomObj;
persLogVolPtrs.insert_element(outGeomObj);
transLogVolPtrs->Resize(noLogVol);
transLogVolPtrs->Insert(noLogVol-1, inGeomObj);
persLogVolPtrs.insert_element(outGeomObj);
}
}
@@ -130,8 +154,12 @@ G4LogicalVolume* G4PGeometryObjectMap::LookUp(
{
assert(inGeomObj != NULL);
for(G4int i=0;i<noLogVol;i++)
{
if( persLogVolPtrs[i] == inGeomObj )
return transLogVolPtrs[i];
{
return transLogVolPtrs->Get(i);
}
}
return NULL;
}
@@ -144,7 +172,7 @@ void G4PGeometryObjectMap::Add( HepRef(G4PLogicalVolume) inGeomObj,
{
if( persLogVolPtrs[i] == inGeomObj )
{
transLogVolPtrs[i] = outGeomObj;
transLogVolPtrs->Insert(i, outGeomObj);
break;
}
G4cerr << "G4PGeometryObjectMap::Add -- transient solid not assigned" << G4endl;
@@ -165,15 +193,17 @@ HepRef(G4PVSolid) G4PGeometryObjectMap::LookUp( G4VSolid* inGeomObj )
for(G4int i=0;i<noSolids;i++)
{
#ifdef G4PERSISTENCY_DEBUG
G4VSolid* tmpSolid = transSolidPtrs[i];
G4VSolid* tmpSolid = transSolidPtrs->Get(i);
cout << "[" << i << "] transSolidPtrs[i]=" << tmpSolid <<G4endl;
cout << " persSolidPtrs[i]=";
HepRef(G4PVSolid) tmpPSolid = persSolidPtrs[i];
tmpPSolid.print();
#endif
if( transSolidPtrs[i] == inGeomObj )
if( transSolidPtrs->Get(i) == inGeomObj )
{
return persSolidPtrs[i];
}
}
return NULL;
@@ -188,9 +218,9 @@ void G4PGeometryObjectMap::Add( G4VSolid* inGeomObj,
{
// assert( inGeomObj == aGeomObj );
noSolids++;
transSolidPtrs.resize(noSolids);
transSolidPtrs[noSolids-1] = inGeomObj;
persSolidPtrs.insert_element(outGeomObj);
transSolidPtrs->Resize(noSolids);
transSolidPtrs->Insert(noSolids-1, inGeomObj);
persSolidPtrs.insert_element(outGeomObj);
}
}
@@ -214,11 +244,13 @@ G4VSolid* G4PGeometryObjectMap::LookUp(
cout << "[" << i << "] persSolidPtrs[i]=";
HepRef(G4PVSolid) tmpPSolid = persSolidPtrs[i];
tmpPSolid.print();
G4VSolid* tmpSolid = transSolidPtrs[i];
G4VSolid* tmpSolid = transSolidPtrs->Get(i);
cout << " transSolidPtrs[i]=" << tmpSolid <<G4endl;
#endif
if( persSolidPtrs[i] == inGeomObj )
return transSolidPtrs[i];
{
return transSolidPtrs->Get(i);
}
}
return NULL;
@@ -232,7 +264,7 @@ void G4PGeometryObjectMap::Add( HepRef(G4PVSolid) inGeomObj,
{
if( persSolidPtrs[i] == inGeomObj )
{
transSolidPtrs[i] = outGeomObj;
transSolidPtrs->Insert(i, outGeomObj);
break;
}
G4cerr << "G4PGeometryObjectMap::Add -- transient solid not assigned" << G4endl;
@@ -244,38 +276,53 @@ void G4PGeometryObjectMap::Add( HepRef(G4PVSolid) inGeomObj,
G4VSolid* G4PGeometryObjectMap::GetSolid(G4int i)
{
if( i >= 0 && i < noSolids)
return transSolidPtrs[i];
{
return transSolidPtrs->Get(i);
}
else
{
return NULL;
}
}
HepRef(G4PVSolid) G4PGeometryObjectMap::GetPSolid(G4int i)
{
if( i >= 0 && i < noSolids)
{
return persSolidPtrs[i];
}
else
{
return NULL;
}
}
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->length() << G4endl;
cout << " -- transLogVolPtrs.length: " << transLogVolPtrs->length() << G4endl;
cout << " -- transSolidPtrs.length: " << transSolidPtrs->length() << G4endl;
#endif
G4int i;
for(i=0;i<noPhysVol;i++)
transPhysVolPtrs[i] = NULL;
{
transPhysVolPtrs->Insert(i, NULL);
}
for(i=0;i<noLogVol;i++)
transLogVolPtrs[i] = NULL;
{
transLogVolPtrs->Insert(i, NULL);
}
for(i=0;i<noSolids;i++)
transSolidPtrs[i] = NULL;
{
transSolidPtrs->Insert(i, NULL);
}
}
source/persistency/geometry/management/src/G4PLogicalVolume.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PLogicalVolume.cc,v 1.5 2000/06/09 12:56:44 morita Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
//
// Takashi.Sasaki@kek.jp
source/persistency/geometry/management/src/G4PPVParameterised.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PPVParameterised.cc,v 1.2 1999/12/15 14:51:24 gunter Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
//
//
source/persistency/geometry/management/src/G4PPVPlacement.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PPVPlacement.cc,v 1.2 1999/12/15 14:51:24 gunter Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
//
//
source/persistency/geometry/management/src/G4PPVReplica.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PPVReplica.cc,v 1.2 1999/12/15 14:51:24 gunter Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
//
//
source/persistency/geometry/management/src/G4PVPhysicalVolume.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PVPhysicalVolume.cc,v 1.3 1999/12/15 14:51:24 gunter Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
//
// Takashi.Sasaki@kek.jp
source/persistency/geometry/management/src/G4PersistentGeomMan.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PersistentGeomMan.cc,v 1.14 2000/06/09 12:56:44 morita Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// class G4PersistentGeomMan
//
source/persistency/geometry/solids/CSG/include/G4PBox.ddl
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PBox.ddl,v 1.3 1999/12/15 14:51:24 gunter Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// class G4PBox
//
source/persistency/geometry/solids/CSG/include/G4PCSGSolid.ddl
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PCSGSolid.ddl,v 1.3 1999/12/15 14:51:24 gunter Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
//
// class G4CSGSolid
source/persistency/geometry/solids/CSG/include/G4PCons.ddl
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PCons.ddl,v 1.3 1999/12/15 14:51:24 gunter Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// class G4Cons
//
source/persistency/geometry/solids/CSG/include/G4PPara.ddl
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PPara.ddl,v 1.4 1999/12/15 14:51:25 gunter Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// class G4PPara
//
source/persistency/geometry/solids/CSG/include/G4PSphere.ddl
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PSphere.ddl,v 1.4 1999/12/15 14:51:25 gunter Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// class G4PSphere
//
source/persistency/geometry/solids/CSG/include/G4PTorus.ddl
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PTorus.ddl,v 1.3 1999/12/15 14:51:25 gunter Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
//
// class G4PTorus
source/persistency/geometry/solids/CSG/include/G4PTrap.ddl
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PTrap.ddl,v 1.4 1999/12/15 14:51:25 gunter Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// class G4PTrap
//
source/persistency/geometry/solids/CSG/include/G4PTrd.ddl
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PTrd.ddl,v 1.3 1999/12/15 14:51:25 gunter Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// class G4PTrd
//
source/persistency/geometry/solids/CSG/include/G4PTubs.ddl
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PTubs.ddl,v 1.3 1999/12/15 14:51:25 gunter Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
//
// class G4PTubs
source/persistency/geometry/solids/CSG/src/G4PBox.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PBox.cc,v 1.2 1999/11/17 10:49:02 morita Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
//
//
source/persistency/geometry/solids/CSG/src/G4PCSGSolid.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PCSGSolid.cc,v 1.2 1999/11/17 10:49:02 morita Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
//
// History:
source/persistency/geometry/solids/CSG/src/G4PCons.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PCons.cc,v 1.2 1999/11/17 10:49:02 morita Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// class G4PCons
//
source/persistency/geometry/solids/CSG/src/G4PPara.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PPara.cc,v 1.2 1999/11/17 10:49:03 morita Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// class G4PPara
//
source/persistency/geometry/solids/CSG/src/G4PSphere.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PSphere.cc,v 1.3 1999/11/17 10:49:03 morita Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
//
// class G4PSphere
source/persistency/geometry/solids/CSG/src/G4PTorus.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PTorus.cc,v 1.3 1999/12/15 14:51:25 gunter Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
//
// class G4PTorus
source/persistency/geometry/solids/CSG/src/G4PTrap.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PTrap.cc,v 1.2 1999/11/17 10:49:03 morita Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// class G4PTrap
//
source/persistency/geometry/solids/CSG/src/G4PTrd.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PTrd.cc,v 1.3 1999/12/15 14:51:25 gunter Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
//
// Implementation for G4Trd class
source/persistency/geometry/solids/CSG/src/G4PTubs.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PTubs.cc,v 1.2 1999/11/17 10:49:03 morita Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
//
// class G4PTubs
source/persistency/geometry/solids/specific/include/G4PHype.ddl
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PHype.ddl,v 1.1 2000/05/11 10:10:11 morita Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// class G4PHype
//
source/persistency/geometry/solids/specific/src/G4PHype.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PHype.cc,v 1.1 2000/05/11 10:10:16 morita Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// class G4PHype
//
source/persistency/global/include/G4DatabaseTypes.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4DatabaseTypes.hh,v 1.3 1999/11/28 21:54:19 morita Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// file description:
source/persistency/global/include/G4PersistentSchema.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PersistentSchema.hh,v 1.5 1999/12/05 22:32:26 morita Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// Persistent-capable schema definitions required for ooddlx processor
//
source/persistency/global/include/G4PersistentTypes.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PersistentTypes.hh,v 1.2 1999/12/15 14:51:26 gunter Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
//
// Persistent-capable typedefs for Geant4/Persistency category
source/persistency/global/include/G4Pglobals.hh
+88
View File
@@ -0,0 +1,88 @@
// 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: G4Pglobals.hh,v 1.1 2000/11/02 12:40:31 morita Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
//
// Wrapper header file to protect globals.hh from ooddlx
//
// History:
// 26.10.00 Y.Morita - Created
#ifndef G4_P_GLOBALS_HH
#define G4_P_GLOBALS_HH 1
#ifndef OO_DDL_TRANSLATION
// use G4 globals if this is not in ooddlx pre-processing
#include "globals.hh"
#else
// substitute G4 globals definitions for ooddlx pre-processing
#define GLOBALS_HH
#define G4TYPES_HH
#define included_G4ios
#define GeomDefs_hh
typedef int G4GeometryType;
#define __tpvector
#define __tvvector
#define __tpordvec
#define __tvordvec
#ifndef G4ROTATIONMATRIX_HH
#define G4ROTATIONMATRIX_HH
class G4RotationMatrix {};
#endif
#ifndef G4Para_HH
#define G4Para_HH
class G4Para {};
#endif
#ifndef G4VMaterialMap_hh
#define G4VMaterialMap_hh 1
class G4VMaterialMap {};
class G4Material {};
#endif
#ifndef G4VPHYSICALVOLUME_HH
#define G4VPHYSICALVOLUME_HH
class G4VPhysicalVolume {};
#endif
#ifndef G4LOGICALVOLUME_HH
#define G4LOGICALVOLUME_HH
class G4LogicalVolume {};
#endif
#ifndef G4VSOLID_HH
#define G4VSOLID_HH
class G4VSolid {};
#endif
#ifndef G4UNITSTEST_HH
#define G4UNITSTEST_HH
#include "G4UnitsTest.hh"
#endif
typedef int EAxis;
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
#endif
source/persistency/global/include/G4VMaterialMap.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4VMaterialMap.hh,v 1.1 2000/06/09 12:53:25 morita Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
#ifndef G4VMaterialMap_hh
source/persistency/global/include/G4VPersistentSubDbMan.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4VPersistentSubDbMan.hh,v 1.3 1999/11/28 21:54:19 morita Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// class G4VPersistentSubDbMan
//
source/persistency/global/include/G4VPersistentSubMan.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4VPersistentSubMan.hh,v 1.2 1999/11/25 11:33:07 morita Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// class G4VPersistentSubMan
//
source/persistency/global/src/G4VMaterialMap.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4VMaterialMap.cc,v 1.1 2000/06/09 12:53:51 morita Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
#include "G4VMaterialMap.hh"
source/persistency/global/src/G4VPersistentSubDbMan.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4VPersistentSubDbMan.cc,v 1.2 1999/11/26 20:37:00 morita Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// class G4VPersistentSubDbMan
//
source/persistency/global/src/G4VPersistentSubMan.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4VPersistentSubMan.cc,v 1.2 1999/11/25 11:33:08 morita Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// class G4VPersistentSubMan
//
source/persistency/management/include/G4PersistencyManager.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PersistencyManager.hh,v 1.15 1999/12/15 14:51:26 gunter Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// History:
// 98.01.08 Y.Morita Initial version
source/persistency/management/include/G4PersistencyMessenger.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PersistencyMessenger.hh,v 1.4 1999/11/26 11:19:39 morita Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
//
// GEANT 4 class header file
source/persistency/management/include/G4TransactionManager.hh
+6 -8
View File
@@ -5,20 +5,17 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4TransactionManager.hh,v 1.6 1999/12/15 14:51:27 gunter Exp $
// GEANT4 tag $Name: geant4-02-00 $
// $Id: G4TransactionManager.hh,v 1.7 2000/12/05 14:40:03 morita Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// class description:
//
// This is a class for handling database transaction
// for G4PersistencyManager.
// To be used by G4PersistencyManager only.
//
// Member functions:
// =================
// G4TransactionManager();
// ~G4TransactionManager();
//
// History:
// 99.11.25 Y.Morita Initial version
@@ -44,13 +41,14 @@ class G4TransactionManager
{
friend class G4PersistencyManager;
protected:
protected: // with description
G4TransactionManager(G4PersistentRunMan* runMan,
G4PersistentEventMan* eventMan,
G4PersistentHitMan* hitMan,
G4PersistentDigitMan* digitMan,
G4PersistentGeomMan* geomMan);
~G4TransactionManager();
// Contructor and Destructor.
private:
HepDbApplication* f_dbApp;
source/persistency/management/src/G4PersistencyManager.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PersistencyManager.cc,v 1.16 1999/12/15 14:51:27 gunter Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// class G4PersistencyManager
//
source/persistency/management/src/G4PersistencyMessenger.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PersistencyMessenger.cc,v 1.7 1999/11/26 16:50:21 morita Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
#include "G4PersistencyMessenger.hh"
source/persistency/management/src/G4TransactionManager.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4TransactionManager.cc,v 1.6 1999/12/15 14:51:27 gunter Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// class G4TransactionManager
//
source/persistency/run/include/G4PRun.ddl
+23 -6
View File
@@ -5,14 +5,25 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4PRun.ddl,v 1.6 1999/12/15 14:51:27 gunter Exp $
// GEANT4 tag $Name: geant4-02-00 $
// $Id: G4PRun.ddl,v 1.8 2000/12/15 08:02:21 morita Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// Class Description:
//
// This is a class which represent a persistent run in Geant4.
// A persistent run object is constructed by
// G4PersistentRunMan::Store() or read back from a database
// by G4PersistentRunMan::Retrieve().
// G4PersistentRunMan::Store() passes a pointer of a transient
// G4Run object. The G4PRun object construct itself by copying
// the data member of G4Run.
//
#ifndef G4PRun_h
#define G4PRun_h 1
#include "globals.hh"
#include "G4Pglobals.hh"
#include "G4Allocator.hh"
#include "HepODBMS/odbms/HepODBMS.h"
@@ -25,12 +36,15 @@ class G4Run;
class G4PRun
: public HepPersObj
{
public:
public: // with description
G4PRun();
G4PRun(const G4Run* aRun);
// Constructors.
virtual ~G4PRun();
// Destructor.
G4Run* MakeTransientObject();
// Construct a transient G4Run object from the data members of
// G4PRun.
protected:
G4Pint runID;
@@ -38,13 +52,16 @@ class G4PRun
// G4HCtable* HCtable;
// G4DCtable* DCtable;
public:
public: // with description
inline void SetRunID(G4int id)
{ runID = id; }
inline G4int GetRunID() const
{ return runID; }
// set and get Run ID.
inline G4int GetNumberOfEvent() const
{ return numberOfEvent; }
// get number of events in this run.
// inline virtual void RecordEvent(G4Event*)
// { numberOfEvent++; }
// inline void SetHCtable(G4HCtable* HCtbl)
source/persistency/run/include/G4PersistentRunMan.hh
+8 -6
View File
@@ -5,15 +5,17 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4PersistentRunMan.hh,v 1.8 1999/11/28 21:54:21 morita Exp $
// GEANT4 tag $Name: geant4-02-00 $
// $Id: G4PersistentRunMan.hh,v 1.9 2000/12/15 07:55:32 morita Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// class G4PersistentRunMan
// Class Description:
// A Utility class to be used by G4PersistencyManager.
// Average users do not need to use this class.
//
// A Utility class for storing and retrieving the run objects.
//
// This class is not persistent-capable.
// This class is not persistent-capable.
//
// Member functions:
// =================
// G4bool Store(HepDbApplication* dbApp, const G4Run* aRun);
source/persistency/run/src/G4PRun.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PRun.cc,v 1.5 1999/12/15 14:51:27 gunter Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
#include "G4Run.hh"
source/persistency/run/src/G4PersistentRunMan.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PersistentRunMan.cc,v 1.8 1999/11/28 21:54:22 morita Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// class G4PersistentRunMan
//