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/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
//