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

Import Geant4 1.1.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-08 15:34:16 +02:00
parent ca1c8cb059
commit 103bda00c8
2654 changed files with 29719 additions and 20203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/persistency/geometry/management/src/G4PGeometryObjectMap.cc
+19 -18
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.3.2.1 1999/12/07 20:50:07 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4PGeometryObjectMap.cc,v 1.5 1999/12/15 14:51:24 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
// class G4PGeometryObjectMap
//
@@ -91,7 +91,7 @@ void G4PGeometryObjectMap::Add( HepRef(G4PVPhysicalVolume) inGeomObj,
transPhysVolPtrs[i] = outGeomObj;
break;
}
cerr << "G4PGeometryObjectMap::Add -- transient solid not assigned" << endl;
G4cerr << "G4PGeometryObjectMap::Add -- transient solid not assigned" << G4endl;
}
}
@@ -147,7 +147,7 @@ void G4PGeometryObjectMap::Add( HepRef(G4PLogicalVolume) inGeomObj,
transLogVolPtrs[i] = outGeomObj;
break;
}
cerr << "G4PGeometryObjectMap::Add -- transient solid not assigned" << endl;
G4cerr << "G4PGeometryObjectMap::Add -- transient solid not assigned" << G4endl;
}
}
@@ -157,8 +157,8 @@ HepRef(G4PVSolid) G4PGeometryObjectMap::LookUp( G4VSolid* inGeomObj )
#ifdef G4PERSISTENCY_DEBUG
cout << "G4PGeometryObjectMap::LookUp(G4VSolid) -- noSolids is "
<< noSolids << endl;
cout << " G4VSolid info: " << inGeomObj << endl;
<< noSolids << G4endl;
cout << " G4VSolid info: " << inGeomObj << G4endl;
#endif
assert(inGeomObj != NULL);
@@ -166,7 +166,7 @@ HepRef(G4PVSolid) G4PGeometryObjectMap::LookUp( G4VSolid* inGeomObj )
{
#ifdef G4PERSISTENCY_DEBUG
G4VSolid* tmpSolid = transSolidPtrs[i];
cout << "[" << i << "] transSolidPtrs[i]=" << tmpSolid <<endl;
cout << "[" << i << "] transSolidPtrs[i]=" << tmpSolid <<G4endl;
cout << " persSolidPtrs[i]=";
HepRef(G4PVSolid) tmpPSolid = persSolidPtrs[i];
tmpPSolid.print();
@@ -202,7 +202,7 @@ G4VSolid* G4PGeometryObjectMap::LookUp(
#ifdef G4PERSISTENCY_DEBUG
cout << "G4PGeometryObjectMap::LookUp(G4PVSolid) -- noSolids is "
<< noSolids << endl;
<< noSolids << G4endl;
cout << " G4PVSolid info:";
inGeomObj.print(stdout);
#endif
@@ -215,7 +215,7 @@ G4VSolid* G4PGeometryObjectMap::LookUp(
HepRef(G4PVSolid) tmpPSolid = persSolidPtrs[i];
tmpPSolid.print();
G4VSolid* tmpSolid = transSolidPtrs[i];
cout << " transSolidPtrs[i]=" << tmpSolid <<endl;
cout << " transSolidPtrs[i]=" << tmpSolid <<G4endl;
#endif
if( persSolidPtrs[i] == inGeomObj )
return transSolidPtrs[i];
@@ -235,7 +235,7 @@ void G4PGeometryObjectMap::Add( HepRef(G4PVSolid) inGeomObj,
transSolidPtrs[i] = outGeomObj;
break;
}
cerr << "G4PGeometryObjectMap::Add -- transient solid not assigned" << endl;
G4cerr << "G4PGeometryObjectMap::Add -- transient solid not assigned" << G4endl;
}
}
@@ -264,17 +264,18 @@ void G4PGeometryObjectMap::InitTransientMap()
transSolidPtrs.resize(noSolids);
#ifdef G4PERSISTENCY_DEBUG
cout << "G4PGeometryObjectMap::InitTransientMap()" << endl;
cout << " -- noPhysVol: " << noPhysVol << endl;
cout << " -- transPhysVolPtrs.length: " << transPhysVolPtrs.length() << endl;
cout << " -- transLogVolPtrs.length: " << transLogVolPtrs.length() << endl;
cout << " -- transSolidPtrs.length: " << transSolidPtrs.length() << endl;
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;
#endif
for(G4int i=0;i<noPhysVol;i++)
G4int i;
for(i=0;i<noPhysVol;i++)
transPhysVolPtrs[i] = NULL;
for(G4int i=0;i<noLogVol;i++)
for(i=0;i<noLogVol;i++)
transLogVolPtrs[i] = NULL;
for(G4int i=0;i<noSolids;i++)
for(i=0;i<noSolids;i++)
transSolidPtrs[i] = NULL;
}
source/persistency/geometry/management/src/G4PLogicalVolume.cc
+2 -2
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4PLogicalVolume.cc,v 1.3.2.1 1999/12/07 20:50:08 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4PLogicalVolume.cc,v 1.4 1999/12/15 14:51:24 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
// Takashi.Sasaki@kek.jp
source/persistency/geometry/management/src/G4PPVParameterised.cc
+2 -2
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4PPVParameterised.cc,v 1.1.10.1 1999/12/07 20:50:08 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4PPVParameterised.cc,v 1.2 1999/12/15 14:51:24 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
//
source/persistency/geometry/management/src/G4PPVPlacement.cc
+2 -2
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4PPVPlacement.cc,v 1.1.10.1 1999/12/07 20:50:08 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4PPVPlacement.cc,v 1.2 1999/12/15 14:51:24 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
//
source/persistency/geometry/management/src/G4PPVReplica.cc
+2 -2
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4PPVReplica.cc,v 1.1.10.1 1999/12/07 20:50:08 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4PPVReplica.cc,v 1.2 1999/12/15 14:51:24 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
//
source/persistency/geometry/management/src/G4PVPhysicalVolume.cc
+2 -2
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4PVPhysicalVolume.cc,v 1.2.4.1 1999/12/07 20:50:08 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4PVPhysicalVolume.cc,v 1.3 1999/12/15 14:51:24 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
// Takashi.Sasaki@kek.jp
source/persistency/geometry/management/src/G4PersistentGeomMan.cc
+20 -20
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4PersistentGeomMan.cc,v 1.9.2.1 1999/12/07 20:50:08 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4PersistentGeomMan.cc,v 1.11 2000/02/23 13:10:36 morita Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
// class G4PersistentGeomMan
//
@@ -87,7 +87,7 @@ G4bool G4PersistentGeomMan::Store( HepDbApplication* dbApp,
{
G4cerr << "G4PersistentGeomMan::Store"
<< " -- error in naming the geometry object map: "
<< f_GeomMapScopeName << endl;
<< f_GeomMapScopeName << G4endl;
return false;
}
@@ -95,8 +95,8 @@ G4bool G4PersistentGeomMan::Store( HepDbApplication* dbApp,
else
{
G4cerr << "G4PersistentGeomMan: Geometry alreday stored in the"
<< "geometry database." << endl
<< " Geometry not stored." << endl;
<< "geometry database." << G4endl
<< " Geometry not stored." << G4endl;
return false;
}
// ----------------------- Objectivity Feature ----------------------- //
@@ -113,7 +113,7 @@ G4bool G4PersistentGeomMan::Store( HepDbApplication* dbApp,
}
else
{
G4cerr << "G4PersistentGeomMan: Error in storing geometry." << endl;
G4cerr << "G4PersistentGeomMan: Error in storing geometry." << G4endl;
return false;
}
@@ -130,7 +130,7 @@ G4bool G4PersistentGeomMan::Retrieve( HepDbApplication* dbApp,
{
G4cerr << "G4PersistentGeomMan::Retrieve"
<< " -- error in looking up the geometry object map: "
<< f_GeomMapScopeName << endl;
<< f_GeomMapScopeName << G4endl;
return false;
}
// ----------------------- Objectivity Feature ----------------------- //
@@ -139,20 +139,20 @@ G4bool G4PersistentGeomMan::Retrieve( HepDbApplication* dbApp,
{
G4cerr << "G4PersistentGeomMan::Retrieve()"
<< " -- error in searching the geometry object map: "
<< f_GeomMapScopeName << endl;
<< f_GeomMapScopeName << G4endl;
return false;
}
if(f_verboseLevel>2)
G4cout << "G4PersistentGeomMan::Retrieve()"
<< " -- f_GeomMap is loaded." << endl;
<< " -- f_GeomMap is loaded." << G4endl;
// initialize the transient part of the geometry object map
f_GeomMap->InitTransientMap();
if(f_verboseLevel>2)
G4cout << "G4PersistentGeomMan::Retrieve(G4VPhysicalVolume*)"
<< " -- f_GeomMap is initialized." << endl;
<< " -- f_GeomMap is initialized." << G4endl;
// loop through the number of solids in the database
G4int nSolids = f_GeomMap->GetNoSolids();
@@ -168,7 +168,7 @@ G4bool G4PersistentGeomMan::Retrieve( HepDbApplication* dbApp,
if(f_verboseLevel>2)
G4cout << "G4PersistentGeomMan::Retrieve(G4VPhysicalVolume*)"
<< " -- Transient Solid is created for nSolids:"
<< nSolids << endl;
<< nSolids << G4endl;
// Locate the persistent world physics volume
HepRef(G4PVPhysicalVolume) persWorld = f_GeomMap->GetWorldVolume();
@@ -177,7 +177,7 @@ G4bool G4PersistentGeomMan::Retrieve( HepDbApplication* dbApp,
{
G4cerr << "G4PersistentGeomMan::Retrieve"
<< " -- geometry object map does not have world volume."
<< endl;
<< G4endl;
return false;
}
@@ -191,7 +191,7 @@ G4bool G4PersistentGeomMan::Retrieve( HepDbApplication* dbApp,
{
G4cerr << "G4PersistentGeomMan::Retrieve"
<< " -- transient world volume is empty."
<< endl;
<< G4endl;
return false;
}
@@ -207,14 +207,14 @@ HepRef(G4PVPhysicalVolume) G4PersistentGeomMan::MakePersistentObject (
{
G4cerr << "G4PersistentGeomMan::MakePersistentObject" <<
" -- Physical Volume recursive depth reached to G4_PHYS_VOLUME_DEPTH_MAX."
<< endl;
<< G4endl;
return NULL;
}
if( f_verboseLevel>2 && f_nRecursive % 1000 == 0 )
G4cout << "G4PersistentGeomMan: "
<< "Physical Volume recursive depth is "
<< f_nRecursive << endl;
<< f_nRecursive << G4endl;
// check if the persistent version of thePhysVol exists
HepRef(G4PVPhysicalVolume) persPhysVol = f_GeomMap->LookUp(thePhysVol);
@@ -315,7 +315,7 @@ HepRef(G4PVSolid) G4PersistentGeomMan::MakePersistentObject (
if(f_verboseLevel>3)
G4cout << "G4PersistentGeomMan::MakePersistentObject (G4VSolid) "
<< "-- theSolidType is " << theSolidType << endl;
<< "-- theSolidType is " << theSolidType << G4endl;
// Construct persistent and concrete solid object
// according to the entity type of theSolid
@@ -393,7 +393,7 @@ HepRef(G4PVSolid) G4PersistentGeomMan::MakePersistentObject (
else
{
G4cerr << " Warning (G4PersistentGeomMan): The solid type ("
<< theSolidType << ") is not supported yet." << endl
<< theSolidType << ") is not supported yet." << G4endl;
}
#endif
@@ -417,14 +417,14 @@ G4VPhysicalVolume* G4PersistentGeomMan::MakeTransientObject (
{
G4cerr << "G4PersistentGeomMan::MakeTransientObject" <<
" -- Physical Volume recursive depth reached to G4_PHYS_VOLUME_DEPTH_MAX."
<< endl;
<< G4endl;
return NULL;
}
if( f_verboseLevel>2 && f_tRecursive % 1000 == 0 )
G4cout << "G4PersistentGeomMan: "
<< "Physical Volume recursive depth is "
<< f_tRecursive << endl;
<< f_tRecursive << G4endl;
// check if the transient version of persPhysVol exists
G4VPhysicalVolume* thePhysVol = f_GeomMap->LookUp(persPhysVol);
@@ -476,7 +476,7 @@ G4LogicalVolume* G4PersistentGeomMan::MakeTransientObject (
if ( theSolid == NULL )
{
G4cerr << "G4PersistentGeomMan::MakeTransientObject" <<
" -- transient Solid not found for the persistent Solid" << endl;
" -- transient Solid not found for the persistent Solid" << G4endl;
}
// Construct the persistent version of theLogVol with theSolid