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

Import Geant4 3.2.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-08 16:10:37 +02:00
parent 137e303ecc
commit 36c080dca6
3464 changed files with 119310 additions and 52696 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/persistency/geometry/global/GNUmakefile
+5 -4
View File
@@ -1,19 +1,20 @@
# $Id: GNUmakefile,v 1.5 1999/12/01 15:21:06 morita Exp $
# $Id: GNUmakefile,v 1.6 2001/03/15 22:58:54 morita Exp $
name := G4pgeomGlobal
G4ODBMS := true
G4ODBMS_INSTALLATION := true
PWD := $(shell (dirname `pwd`/dummy | sed -e 's/ //g'))
ifndef G4INSTALL
G4INSTALL = ../../../..
G4INSTALL = $(PWD)/../../../..
endif
include $(G4INSTALL)/config/architecture.gmk
G4OODDLX_BOOT := $(G4TMPSCHEMA_BOOT)
G4OODDLX_BOOT := $(G4SCHEMA_BOOT)
CPPFLAGS += \
-Iinclude \
-I$(PWD)/include \
-I$(G4TMPDIR) \
-I$(G4INSTALL)/source/persistency/global/include \
-I$(G4INSTALL)/source/global/management/include \
source/persistency/geometry/global/include/G4PAffineTransform.ddl
+23 -7
View File
@@ -1,12 +1,28 @@
// 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.
// ********************************************************************
// * 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: G4PAffineTransform.ddl,v 1.4 1999/12/15 14:51:22 gunter Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// $Id: G4PAffineTransform.ddl,v 1.4.4.1 2001/06/28 19:11:27 gunter Exp $
// GEANT4 tag $Name: $
//
// persistenet class of G4AffineTransform
//
source/persistency/geometry/global/include/G4PVSolid.ddl
+23 -7
View File
@@ -1,12 +1,28 @@
// 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.
// ********************************************************************
// * 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: G4PVSolid.ddl,v 1.4 2000/11/02 12:42:06 morita Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// $Id: G4PVSolid.ddl,v 1.4.4.1 2001/06/28 19:11:27 gunter Exp $
// GEANT4 tag $Name: $
//
//
// class G4PVSolid
source/persistency/geometry/global/src/G4PAffineTransform.cc
+23 -7
View File
@@ -1,12 +1,28 @@
// 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.
// ********************************************************************
// * 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: G4PAffineTransform.cc,v 1.2 1999/12/15 14:51:22 gunter Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// $Id: G4PAffineTransform.cc,v 1.2.4.1 2001/06/28 19:11:27 gunter Exp $
// GEANT4 tag $Name: $
//
// class G4PAffineTransform
//
source/persistency/geometry/global/src/G4PVSolid.cc
+23 -7
View File
@@ -1,12 +1,28 @@
// 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.
// ********************************************************************
// * 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: G4PVSolid.cc,v 1.2 1999/12/15 14:51:22 gunter Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// $Id: G4PVSolid.cc,v 1.2.4.1 2001/06/28 19:11:27 gunter Exp $
// GEANT4 tag $Name: $
//
// class G4PVSolid
//
source/persistency/geometry/management/GNUmakefile
+5 -4
View File
@@ -1,19 +1,20 @@
# $Id: GNUmakefile,v 1.12 2000/06/08 11:46:43 morita Exp $
# $Id: GNUmakefile,v 1.13 2001/03/15 22:58:54 morita Exp $
name := G4pgeomn
G4ODBMS := true
G4ODBMS_INSTALLATION := true
PWD := $(shell (dirname `pwd`/dummy | sed -e 's/ //g'))
ifndef G4INSTALL
G4INSTALL = ../../../..
G4INSTALL = $(PWD)/../../../..
endif
include $(G4INSTALL)/config/architecture.gmk
G4OODDLX_BOOT := $(G4TMPSCHEMA_BOOT)
G4OODDLX_BOOT := $(G4SCHEMA_BOOT)
CPPFLAGS += \
-Iinclude \
-I$(PWD)/include \
-I$(G4SCHEMA_HEADER_DIR) \
-I$(G4TMP)/$(G4SYSTEM)/G4pgeomGlobal \
-I$(G4TMP)/$(G4SYSTEM)/G4pcsg \
source/persistency/geometry/management/include/G4LogVolRefArray.hh
+23 -7
View File
@@ -1,12 +1,28 @@
// 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.
// ********************************************************************
// * 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 2000/11/17 05:10:02 morita Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// $Id: G4LogVolRefArray.hh,v 1.1.4.1 2001/06/28 19:11:27 gunter Exp $
// GEANT4 tag $Name: $
//
// class description:
source/persistency/geometry/management/include/G4PGeometryObjectMap.ddl
+23 -7
View File
@@ -1,12 +1,28 @@
// 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.
// ********************************************************************
// * 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: G4PGeometryObjectMap.ddl,v 1.7 2000/11/22 15:29:39 morita Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// $Id: G4PGeometryObjectMap.ddl,v 1.7.4.1 2001/06/28 19:11:27 gunter Exp $
// GEANT4 tag $Name: $
//
// class description:
source/persistency/geometry/management/include/G4PLogicalVolume.ddl
+23 -7
View File
@@ -1,12 +1,28 @@
// 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.
// ********************************************************************
// * 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: G4PLogicalVolume.ddl,v 1.9 2000/11/02 12:42:11 morita Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// $Id: G4PLogicalVolume.ddl,v 1.9.4.1 2001/06/28 19:11:27 gunter Exp $
// GEANT4 tag $Name: $
//
//
// class G4PLogicalVolume
source/persistency/geometry/management/include/G4PPVParameterised.ddl
+23 -7
View File
@@ -1,12 +1,28 @@
// 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.
// ********************************************************************
// * 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: G4PPVParameterised.ddl,v 1.4 1999/12/15 14:51:23 gunter Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// $Id: G4PPVParameterised.ddl,v 1.4.4.1 2001/06/28 19:11:27 gunter Exp $
// GEANT4 tag $Name: $
//
// class G4PPVParameterised
//
source/persistency/geometry/management/include/G4PPVPlacement.ddl
+23 -7
View File
@@ -1,12 +1,28 @@
// 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.
// ********************************************************************
// * 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: G4PPVPlacement.ddl,v 1.4 1999/12/15 14:51:23 gunter Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// $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
source/persistency/geometry/management/include/G4PPVReplica.ddl
+23 -7
View File
@@ -1,12 +1,28 @@
// 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.
// ********************************************************************
// * 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: G4PPVReplica.ddl,v 1.5 2000/11/02 12:42:11 morita Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// $Id: G4PPVReplica.ddl,v 1.5.4.1 2001/06/28 19:11:27 gunter Exp $
// GEANT4 tag $Name: $
//
//
// class G4PPVReplica
source/persistency/geometry/management/include/G4PVPhysicalVolume.ddl
+23 -7
View File
@@ -1,12 +1,28 @@
// 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.
// ********************************************************************
// * 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: G4PVPhysicalVolume.ddl,v 1.5 2000/11/02 12:42:11 morita Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// $Id: G4PVPhysicalVolume.ddl,v 1.5.4.1 2001/06/28 19:11:28 gunter Exp $
// GEANT4 tag $Name: $
//
//
// class G4PVPhysicalVolume
source/persistency/geometry/management/include/G4PersistentGeomMan.hh
+23 -7
View File
@@ -1,12 +1,28 @@
// 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.
// ********************************************************************
// * 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: G4PersistentGeomMan.hh,v 1.10 2000/12/15 07:56:35 morita Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// $Id: G4PersistentGeomMan.hh,v 1.10.4.1 2001/06/28 19:11:28 gunter Exp $
// GEANT4 tag $Name: $
//
// Class Description:
source/persistency/geometry/management/include/G4VPhysVolRefArray.hh
+23 -7
View File
@@ -1,12 +1,28 @@
// 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.
// ********************************************************************
// * 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 2000/11/17 05:10:02 morita Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// $Id: G4VPhysVolRefArray.hh,v 1.1.4.1 2001/06/28 19:11:28 gunter Exp $
// GEANT4 tag $Name: $
//
// class description:
source/persistency/geometry/management/include/G4VSolidRefArray.hh
+23 -7
View File
@@ -1,12 +1,28 @@
// 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.
// ********************************************************************
// * 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 2000/11/17 05:10:03 morita Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// $Id: G4VSolidRefArray.hh,v 1.1.4.1 2001/06/28 19:11:28 gunter Exp $
// GEANT4 tag $Name: $
//
// class description:
source/persistency/geometry/management/src/G4PGeometryObjectMap.cc
+49 -33
View File
@@ -1,12 +1,28 @@
// 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.
// ********************************************************************
// * 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: G4PGeometryObjectMap.cc,v 1.6 2000/11/17 05:10:03 morita Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// $Id: G4PGeometryObjectMap.cc,v 1.7.2.1 2001/06/28 19:11:28 gunter Exp $
// GEANT4 tag $Name: $
//
// class G4PGeometryObjectMap
//
@@ -56,7 +72,7 @@ G4PGeometryObjectMap::~G4PGeometryObjectMap()
HepRef(G4PVPhysicalVolume) G4PGeometryObjectMap::LookUp(
G4VPhysicalVolume* inGeomObj )
{
assert(inGeomObj != NULL);
assert(inGeomObj != 0);
for(G4int i=0;i<noPhysVol;i++)
{
if( transPhysVolPtrs->Get(i) == inGeomObj )
@@ -65,15 +81,15 @@ HepRef(G4PVPhysicalVolume) G4PGeometryObjectMap::LookUp(
}
}
return NULL;
return 0;
}
void G4PGeometryObjectMap::Add( G4VPhysicalVolume* inGeomObj,
HepRef(G4PVPhysicalVolume) outGeomObj )
{
assert(inGeomObj != NULL);
assert(inGeomObj != 0);
HepRef(G4PVPhysicalVolume) aGeomObj = LookUp( inGeomObj );
if( aGeomObj == NULL )
if( aGeomObj == 0 )
{
// assert( inGeomObj == aGeomObj );
noPhysVol++;
@@ -88,7 +104,7 @@ void G4PGeometryObjectMap::Add( G4VPhysicalVolume* inGeomObj,
G4VPhysicalVolume* G4PGeometryObjectMap::LookUp(
HepRef(G4PVPhysicalVolume) inGeomObj )
{
assert(inGeomObj != NULL);
assert(inGeomObj != 0);
for(G4int i=0;i<noPhysVol;i++)
{
if( persPhysVolPtrs[i] == inGeomObj )
@@ -97,13 +113,13 @@ G4VPhysicalVolume* G4PGeometryObjectMap::LookUp(
}
}
return NULL;
return 0;
}
void G4PGeometryObjectMap::Add( HepRef(G4PVPhysicalVolume) inGeomObj,
G4VPhysicalVolume* outGeomObj )
{
assert(inGeomObj != NULL);
assert(inGeomObj != 0);
for(G4int i=0;i<noPhysVol;i++)
{
if( persPhysVolPtrs[i] == inGeomObj )
@@ -120,7 +136,7 @@ void G4PGeometryObjectMap::Add( HepRef(G4PVPhysicalVolume) inGeomObj,
HepRef(G4PLogicalVolume) G4PGeometryObjectMap::LookUp(
G4LogicalVolume* inGeomObj )
{
assert(inGeomObj != NULL);
assert(inGeomObj != 0);
for(G4int i=0;i<noLogVol;i++)
{
if( transLogVolPtrs->Get(i) == inGeomObj )
@@ -129,15 +145,15 @@ HepRef(G4PLogicalVolume) G4PGeometryObjectMap::LookUp(
}
}
return NULL;
return 0;
}
void G4PGeometryObjectMap::Add( G4LogicalVolume* inGeomObj,
HepRef(G4PLogicalVolume) outGeomObj )
{
assert(inGeomObj != NULL);
assert(inGeomObj != 0);
HepRef(G4PLogicalVolume) aGeomObj = LookUp( inGeomObj );
if( aGeomObj == NULL )
if( aGeomObj == 0 )
{
// assert( inGeomObj == aGeomObj );
noLogVol++;
@@ -152,7 +168,7 @@ void G4PGeometryObjectMap::Add( G4LogicalVolume* inGeomObj,
G4LogicalVolume* G4PGeometryObjectMap::LookUp(
HepRef(G4PLogicalVolume) inGeomObj )
{
assert(inGeomObj != NULL);
assert(inGeomObj != 0);
for(G4int i=0;i<noLogVol;i++)
{
if( persLogVolPtrs[i] == inGeomObj )
@@ -161,13 +177,13 @@ G4LogicalVolume* G4PGeometryObjectMap::LookUp(
}
}
return NULL;
return 0;
}
void G4PGeometryObjectMap::Add( HepRef(G4PLogicalVolume) inGeomObj,
G4LogicalVolume* outGeomObj )
{
assert(inGeomObj != NULL);
assert(inGeomObj != 0);
for(G4int i=0;i<noLogVol;i++)
{
if( persLogVolPtrs[i] == inGeomObj )
@@ -189,7 +205,7 @@ HepRef(G4PVSolid) G4PGeometryObjectMap::LookUp( G4VSolid* inGeomObj )
cout << " G4VSolid info: " << inGeomObj << G4endl;
#endif
assert(inGeomObj != NULL);
assert(inGeomObj != 0);
for(G4int i=0;i<noSolids;i++)
{
#ifdef G4PERSISTENCY_DEBUG
@@ -206,15 +222,15 @@ HepRef(G4PVSolid) G4PGeometryObjectMap::LookUp( G4VSolid* inGeomObj )
}
}
return NULL;
return 0;
}
void G4PGeometryObjectMap::Add( G4VSolid* inGeomObj,
HepRef(G4PVSolid) outGeomObj )
{
assert(inGeomObj != NULL);
assert(inGeomObj != 0);
HepRef(G4PVSolid) aGeomObj = LookUp( inGeomObj );
if( aGeomObj == NULL )
if( aGeomObj == 0 )
{
// assert( inGeomObj == aGeomObj );
noSolids++;
@@ -237,7 +253,7 @@ G4VSolid* G4PGeometryObjectMap::LookUp(
inGeomObj.print(stdout);
#endif
assert(inGeomObj != NULL);
assert(inGeomObj != 0);
for(G4int i=0;i<noSolids;i++)
{
#ifdef G4PERSISTENCY_DEBUG
@@ -253,13 +269,13 @@ G4VSolid* G4PGeometryObjectMap::LookUp(
}
}
return NULL;
return 0;
}
void G4PGeometryObjectMap::Add( HepRef(G4PVSolid) inGeomObj,
G4VSolid* outGeomObj )
{
assert(inGeomObj != NULL);
assert(inGeomObj != 0);
for(G4int i=0;i<noSolids;i++)
{
if( persSolidPtrs[i] == inGeomObj )
@@ -281,7 +297,7 @@ G4VSolid* G4PGeometryObjectMap::GetSolid(G4int i)
}
else
{
return NULL;
return 0;
}
}
@@ -293,7 +309,7 @@ HepRef(G4PVSolid) G4PGeometryObjectMap::GetPSolid(G4int i)
}
else
{
return NULL;
return 0;
}
}
@@ -314,15 +330,15 @@ void G4PGeometryObjectMap::InitTransientMap()
G4int i;
for(i=0;i<noPhysVol;i++)
{
transPhysVolPtrs->Insert(i, NULL);
transPhysVolPtrs->Insert(i, 0);
}
for(i=0;i<noLogVol;i++)
{
transLogVolPtrs->Insert(i, NULL);
transLogVolPtrs->Insert(i, 0);
}
for(i=0;i<noSolids;i++)
{
transSolidPtrs->Insert(i, NULL);
transSolidPtrs->Insert(i, 0);
}
}
source/persistency/geometry/management/src/G4PLogicalVolume.cc
+26 -10
View File
@@ -1,12 +1,28 @@
// 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.
// ********************************************************************
// * 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: G4PLogicalVolume.cc,v 1.5 2000/06/09 12:56:44 morita Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// $Id: G4PLogicalVolume.cc,v 1.6.2.1 2001/06/28 19:11:28 gunter Exp $
// GEANT4 tag $Name: $
//
//
// Takashi.Sasaki@kek.jp
@@ -81,8 +97,8 @@ G4LogicalVolume* G4PLogicalVolume::MakeTransientObject(
G4Material* theMaterial)
{
// These are null poineters temporaly
G4SmartVoxelHeader* fVoxel = NULL;
const G4VisAttributes* fVisAttributes = NULL;
G4SmartVoxelHeader* fVoxel = 0;
const G4VisAttributes* fVisAttributes = 0;
// G4LogicalVolume(G4VSolid *pSolid, G4Material *pMaterial,
// const G4String& name,
@@ -132,7 +148,7 @@ void G4PLogicalVolume::RemoveDaughter(const HepRef(G4PVPhysicalVolume) p)
for ( G4int i=0; i<NoOfDaughters; i++)
if ( fDaughters[i] == p )
{
fDaughters.replace_element_at(NULL,i);
fDaughters.replace_element_at(0,i);
NoOfDaughters--;
}
}
source/persistency/geometry/management/src/G4PPVParameterised.cc
+25 -9
View File
@@ -1,12 +1,28 @@
// 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.
// ********************************************************************
// * 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: G4PPVParameterised.cc,v 1.2 1999/12/15 14:51:24 gunter Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// $Id: G4PPVParameterised.cc,v 1.3.2.1 2001/06/28 19:11:28 gunter Exp $
// GEANT4 tag $Name: $
//
//
//
@@ -30,7 +46,7 @@ G4PPVParameterised::G4PPVParameterised( G4VPhysicalVolume* PhysVol,
: G4PPVReplica(PhysVol, persLogVol)
{
// G4VPVParameterisation class has no data member
// fparam = NULL;
// fparam = 0;
}
G4PPVParameterised::~G4PPVParameterised()
@@ -46,7 +62,7 @@ G4VPhysicalVolume* G4PPVParameterised::MakeTransientObject(
G4int nReplicas = fnReplicas;
G4VPhysicalVolume* aPhysVol = new G4PVParameterised(
pName, aLogical, aMother, pAxis, nReplicas, NULL);
pName, aLogical, aMother, pAxis, nReplicas, 0);
return aPhysVol;
}
source/persistency/geometry/management/src/G4PPVPlacement.cc
+23 -7
View File
@@ -1,12 +1,28 @@
// 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.
// ********************************************************************
// * 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: G4PPVPlacement.cc,v 1.2 1999/12/15 14:51:24 gunter Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// $Id: G4PPVPlacement.cc,v 1.2.4.1 2001/06/28 19:11:28 gunter Exp $
// GEANT4 tag $Name: $
//
//
//
source/persistency/geometry/management/src/G4PPVReplica.cc
+23 -7
View File
@@ -1,12 +1,28 @@
// 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.
// ********************************************************************
// * 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: G4PPVReplica.cc,v 1.2 1999/12/15 14:51:24 gunter Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// $Id: G4PPVReplica.cc,v 1.2.4.1 2001/06/28 19:11:28 gunter Exp $
// GEANT4 tag $Name: $
//
//
//
source/persistency/geometry/management/src/G4PVPhysicalVolume.cc
+25 -9
View File
@@ -1,12 +1,28 @@
// 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.
// ********************************************************************
// * 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: G4PVPhysicalVolume.cc,v 1.3 1999/12/15 14:51:24 gunter Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// $Id: G4PVPhysicalVolume.cc,v 1.4.2.1 2001/06/28 19:11:29 gunter Exp $
// GEANT4 tag $Name: $
//
//
// Takashi.Sasaki@kek.jp
@@ -24,7 +40,7 @@
#include "G4PLogicalVolume.hh"
G4PVPhysicalVolume::G4PVPhysicalVolume()
: flogical(NULL), fname(NULL), fmother(NULL)
: flogical(0), fname(0), fmother(0)
{
frot.resize(9);
ftrans.resize(3);
@@ -68,7 +84,7 @@ G4VPhysicalVolume* G4PVPhysicalVolume::MakeTransientObject(
// quick solution.
G4VPhysicalVolume* aPhysVol = new G4PVPlacement(
pRot, tlate, pName = fname, aLogical, NULL, false, 0);
pRot, tlate, pName = fname, aLogical, 0, false, 0);
aPhysVol->SetMother(aMother);
return aPhysVol;
source/persistency/geometry/management/src/G4PersistentGeomMan.cc
+57 -41
View File
@@ -1,12 +1,28 @@
// 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.
// ********************************************************************
// * 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: G4PersistentGeomMan.cc,v 1.14 2000/06/09 12:56:44 morita Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// $Id: G4PersistentGeomMan.cc,v 1.15.2.1 2001/06/28 19:11:29 gunter Exp $
// GEANT4 tag $Name: $
//
// class G4PersistentGeomMan
//
@@ -58,7 +74,7 @@
#include "G4ios.hh"
G4PersistentGeomMan::G4PersistentGeomMan()
: f_GeomMap(NULL), f_GeomMapScopeName("Geant4 Geometry Object Map")
: f_GeomMap(0), f_GeomMapScopeName("Geant4 Geometry Object Map")
{;}
G4PersistentGeomMan::~G4PersistentGeomMan()
@@ -110,7 +126,7 @@ G4bool G4PersistentGeomMan::Store( HepDbApplication* dbApp,
HepRef(G4PVPhysicalVolume) persWorld =
MakePersistentObject( (G4VPhysicalVolume*)aWorld );
if ( persWorld != NULL )
if ( persWorld != 0 )
{
// set the persistent World Volume to f_GeomMap
f_GeomMap->SetWorldVolume( persWorld );
@@ -127,7 +143,7 @@ G4bool G4PersistentGeomMan::Store( HepDbApplication* dbApp,
G4bool G4PersistentGeomMan::Retrieve( HepDbApplication* dbApp,
G4VPhysicalVolume*& theWorld)
{
theWorld = NULL;
theWorld = 0;
G4VMaterialMap* f_Materialmap = G4VMaterialMap::GetMaterialMap();
if(f_verboseLevel>0)
@@ -148,7 +164,7 @@ G4bool G4PersistentGeomMan::Retrieve( HepDbApplication* dbApp,
}
// ----------------------- Objectivity Feature ----------------------- //
if ( f_GeomMap == NULL )
if ( f_GeomMap == 0 )
{
G4cerr << "G4PersistentGeomMan::Retrieve()"
<< " -- error in searching the geometry object map: "
@@ -186,7 +202,7 @@ G4bool G4PersistentGeomMan::Retrieve( HepDbApplication* dbApp,
// Locate the persistent world physics volume
HepRef(G4PVPhysicalVolume) persWorld = f_GeomMap->GetWorldVolume();
if ( persWorld == NULL )
if ( persWorld == 0 )
{
G4cerr << "G4PersistentGeomMan::Retrieve"
<< " -- geometry object map does not have world volume."
@@ -197,10 +213,10 @@ G4bool G4PersistentGeomMan::Retrieve( HepDbApplication* dbApp,
// start the recursive data member copy
// to create the transient geometry object tree
HepRef(G4PVPhysicalVolume) persMother = NULL;
HepRef(G4PVPhysicalVolume) persMother = 0;
theWorld = MakeTransientObject( persWorld, persMother );
if ( theWorld == NULL )
if ( theWorld == 0 )
{
G4cerr << "G4PersistentGeomMan::Retrieve"
<< " -- transient world volume is empty."
@@ -221,7 +237,7 @@ HepRef(G4PVPhysicalVolume) G4PersistentGeomMan::MakePersistentObject (
G4cerr << "G4PersistentGeomMan::MakePersistentObject" <<
" -- Physical Volume recursive depth reached to G4_PHYS_VOLUME_DEPTH_MAX."
<< G4endl;
return NULL;
return 0;
}
if( f_verboseLevel>2 && f_nRecursive % 1000 == 0 )
@@ -231,7 +247,7 @@ HepRef(G4PVPhysicalVolume) G4PersistentGeomMan::MakePersistentObject (
// check if the persistent version of thePhysVol exists
HepRef(G4PVPhysicalVolume) persPhysVol = f_GeomMap->LookUp(thePhysVol);
if ( persPhysVol == NULL )
if ( persPhysVol == 0 )
{
// Get the Logical Volume in thePhysVol
G4LogicalVolume* theLogVol = thePhysVol->GetLogicalVolume();
@@ -240,7 +256,7 @@ HepRef(G4PVPhysicalVolume) G4PersistentGeomMan::MakePersistentObject (
HepRef(G4PLogicalVolume) persLogVol =
MakePersistentObject( theLogVol );
#ifdef G4DEBUG
assert( persLogVol != NULL );
assert( persLogVol != 0 );
#endif
// Construct the persistent version of thePhysVol for each type of volume
@@ -261,7 +277,7 @@ HepRef(G4PVPhysicalVolume) G4PersistentGeomMan::MakePersistentObject (
break;
}
#ifdef G4DEBUG
assert( persPhysVol != NULL );
assert( persPhysVol != 0 );
#endif
// register persPhysVol to the geometry object lookup table
@@ -278,7 +294,7 @@ HepRef(G4PLogicalVolume) G4PersistentGeomMan::MakePersistentObject (
{
// check if the persistent version of theLogVol exists
HepRef(G4PLogicalVolume) persLogVol = f_GeomMap->LookUp(theLogVol);
if ( persLogVol == NULL )
if ( persLogVol == 0 )
{
// get the solid of the transient logical volume
G4VSolid* theSolid = theLogVol->GetSolid();
@@ -289,7 +305,7 @@ HepRef(G4PLogicalVolume) G4PersistentGeomMan::MakePersistentObject (
// Construct the persistent version of theLogVol
persLogVol = new(f_container) G4PLogicalVolume(theLogVol, persSolid);
#ifdef G4DEBUG
assert( persLogVol != NULL );
assert( persLogVol != 0 );
#endif
// register persLogVol to the geometry object lookup table
@@ -307,7 +323,7 @@ HepRef(G4PLogicalVolume) G4PersistentGeomMan::MakePersistentObject (
MakePersistentObject( dPhysVol );
// add persistent daughter volume to the persistent logical volume
if ( persDaughterPhysVol != NULL )
if ( persDaughterPhysVol != 0 )
persLogVol->AddDaughter( persDaughterPhysVol );
} // end of for(G4int i=0;i<nDaughters;i++)
@@ -322,7 +338,7 @@ HepRef(G4PVSolid) G4PersistentGeomMan::MakePersistentObject (
{
// check if the persistent version of theSolid exists
HepRef(G4PVSolid) persSolid = f_GeomMap->LookUp(theSolid);
if ( persSolid == NULL )
if ( persSolid == 0 )
{
G4GeometryType theSolidType = theSolid->GetEntityType();
@@ -375,8 +391,8 @@ HepRef(G4PVSolid) G4PersistentGeomMan::MakePersistentObject (
G4VSolid* aSolidA = boolSolid->GetConstituentSolid(0);
G4VSolid* aSolidB = boolSolid->GetConstituentSolid(1);
#ifdef G4DEBUG
assert(aSolidA!=NULL);
assert(aSolidB!=NULL);
assert(aSolidA!=0);
assert(aSolidB!=0);
#endif
HepRef(G4PVSolid) persSolidA = MakePersistentObject(aSolidA);
HepRef(G4PVSolid) persSolidB = MakePersistentObject(aSolidB);
@@ -407,7 +423,7 @@ HepRef(G4PVSolid) G4PersistentGeomMan::MakePersistentObject (
G4DisplacedSolid* dispSolid = (G4DisplacedSolid*) theSolid;
G4VSolid* movedSolid = dispSolid->GetConstituentMovedSolid();
#ifdef G4DEBUG
assert(movedSolid!=NULL);
assert(movedSolid!=0);
#endif
HepRef(G4PVSolid) persMovedSolid = MakePersistentObject(movedSolid);
@@ -426,7 +442,7 @@ HepRef(G4PVSolid) G4PersistentGeomMan::MakePersistentObject (
#endif
// register persSolid to the geometry object lookup table
if ( persSolid != NULL )
if ( persSolid != 0 )
f_GeomMap->Add( theSolid, persSolid );
} // end of if f_GeomMap->LookUp(theSolid)
@@ -446,7 +462,7 @@ G4VPhysicalVolume* G4PersistentGeomMan::MakeTransientObject (
G4cerr << "G4PersistentGeomMan::MakeTransientObject" <<
" -- Physical Volume recursive depth reached to G4_PHYS_VOLUME_DEPTH_MAX."
<< G4endl;
return NULL;
return 0;
}
if( f_verboseLevel>2 && f_tRecursive % 1000 == 0 )
@@ -456,7 +472,7 @@ G4VPhysicalVolume* G4PersistentGeomMan::MakeTransientObject (
// check if the transient version of persPhysVol exists
G4VPhysicalVolume* thePhysVol = f_GeomMap->LookUp(persPhysVol);
if ( thePhysVol == NULL )
if ( thePhysVol == 0 )
{
// Get the Logical Volume in persPhysVol
HepRef(G4PLogicalVolume) persLogVol = persPhysVol->GetLogicalVolume();
@@ -465,7 +481,7 @@ G4VPhysicalVolume* G4PersistentGeomMan::MakeTransientObject (
G4LogicalVolume* theLogVol =
MakeTransientObject( persLogVol, persPhysVol );
#ifdef G4DEBUG
assert( theLogVol != NULL );
assert( theLogVol != 0 );
#endif
// Construct the transient version of persPhysVol
@@ -473,7 +489,7 @@ G4VPhysicalVolume* G4PersistentGeomMan::MakeTransientObject (
thePhysVol = persPhysVol->MakeTransientObject(
theLogVol, f_GeomMap->LookUp(persMotherVol) );
#ifdef G4DEBUG
assert( thePhysVol != NULL );
assert( thePhysVol != 0 );
#endif
// register thePhysVol to the geometry object lookup table
@@ -490,19 +506,19 @@ G4LogicalVolume* G4PersistentGeomMan::MakeTransientObject (
{
// check if the transient version of persLogVol exists
G4LogicalVolume* theLogVol = f_GeomMap->LookUp(persLogVol);
if ( theLogVol == NULL )
if ( theLogVol == 0 )
{
// get the solid of the persistent logical volume
HepRef(G4PVSolid) persSolid = persLogVol->GetSolid();
#ifdef G4DEBUG
assert( persSolid != NULL );
assert( persSolid != 0 );
#endif
// check if the transient version of persSolid exists
G4VSolid* theSolid = f_GeomMap->LookUp(persSolid);
#ifdef G4DEBUG
if ( theSolid == NULL )
if ( theSolid == 0 )
{
G4cerr << "G4PersistentGeomMan::MakeTransientObject" <<
" -- transient Solid not found for the persistent Solid" << G4endl;
@@ -510,7 +526,7 @@ G4LogicalVolume* G4PersistentGeomMan::MakeTransientObject (
#endif
// Lookup the material from name
G4Material* theMaterial = NULL;
G4Material* theMaterial = 0;
if( f_MaterialMap )
{
theMaterial = f_MaterialMap->LookUp(persLogVol->GetMaterialName());
@@ -519,7 +535,7 @@ G4LogicalVolume* G4PersistentGeomMan::MakeTransientObject (
// Construct the persistent version of theLogVol with theSolid
theLogVol = persLogVol->MakeTransientObject(theSolid, theMaterial);
#ifdef G4DEBUG
assert( theLogVol != NULL );
assert( theLogVol != 0 );
#endif
// register theLogVol to the geometry object lookup table
@@ -538,7 +554,7 @@ G4LogicalVolume* G4PersistentGeomMan::MakeTransientObject (
MakeTransientObject( persDaughterPhysVol, persMotherVol );
// add transient daughter volume to the transient logical volume
if ( theDaughterPhysVol != NULL )
if ( theDaughterPhysVol != 0 )
theLogVol->AddDaughter( theDaughterPhysVol );
} // end of for(G4int i=0;i<nDaughters;i++)
@@ -553,7 +569,7 @@ G4VSolid* G4PersistentGeomMan::MakeTransientObject (
{
// check if the persistent version of theSolid exists
G4VSolid* transSolid = f_GeomMap->LookUp(persSolid);
if ( transSolid == NULL )
if ( transSolid == 0 )
{
G4GeometryType theSolidType = persSolid->GetEntityType();
@@ -568,8 +584,8 @@ G4VSolid* G4PersistentGeomMan::MakeTransientObject (
HepRef(G4PVSolid) aSolidA = boolSolid->GetConstituentSolid(0);
HepRef(G4PVSolid) aSolidB = boolSolid->GetConstituentSolid(1);
#ifdef G4DEBUG
assert(aSolidA!=NULL);
assert(aSolidB!=NULL);
assert(aSolidA!=0);
assert(aSolidB!=0);
#endif
G4VSolid* transSolidA = MakeTransientObject(aSolidA);
G4VSolid* transSolidB = MakeTransientObject(aSolidB);
@@ -584,7 +600,7 @@ G4VSolid* G4PersistentGeomMan::MakeTransientObject (
(HepRef(G4PDisplacedSolid)) persSolid;
HepRef(G4PVSolid) movedSolid = dispSolid->GetConstituentMovedSolid();
#ifdef G4DEBUG
assert(movedSolid!=NULL);
assert(movedSolid!=0);
#endif
G4VSolid* transMovedSolid = MakeTransientObject(movedSolid);
transSolid = dispSolid->MakeTransientDisplacedSolid( transMovedSolid );
@@ -595,7 +611,7 @@ G4VSolid* G4PersistentGeomMan::MakeTransientObject (
transSolid = persSolid->MakeTransientObject();
}
#ifdef G4DEBUG
assert( transSolid != NULL );
assert( transSolid != 0 );
#endif
f_GeomMap->Add( persSolid, transSolid );
}
source/persistency/geometry/solids/Boolean/GNUmakefile
+5 -4
View File
@@ -1,19 +1,20 @@
# $Id: GNUmakefile,v 1.7 1999/12/01 15:21:07 morita Exp $
# $Id: GNUmakefile,v 1.8 2001/03/15 22:58:54 morita Exp $
name := G4pgeomBoolean
G4ODBMS := true
G4ODBMS_INSTALLATION := true
PWD := $(shell (dirname `pwd`/dummy | sed -e 's/ //g'))
ifndef G4INSTALL
G4INSTALL = ../../../../..
G4INSTALL = $(PWD)/../../../../..
endif
include $(G4INSTALL)/config/architecture.gmk
G4OODDLX_BOOT := $(G4TMPSCHEMA_BOOT)
G4OODDLX_BOOT := $(G4SCHEMA_BOOT)
CPPFLAGS += \
-Iinclude \
-I$(PWD)/include \
-I$(G4SCHEMA_HEADER_DIR) \
-I$(G4TMP)/$(G4SYSTEM)/G4pgeomGlobal \
-I$(G4BASE)/persistency/global/include \
source/persistency/geometry/solids/Boolean/include/G4PBooleanSolid.ddl
+22
View File
@@ -1,3 +1,25 @@
//
// ********************************************************************
// * 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. *
// ********************************************************************
//
// Persistent base class for solids created by boolean operations
// between other solids
//
source/persistency/geometry/solids/Boolean/include/G4PDisplacedSolid.ddl
+22
View File
@@ -1,3 +1,25 @@
//
// ********************************************************************
// * 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. *
// ********************************************************************
//
// Persistent class describing solid placements for boolean operations
//
// History:
source/persistency/geometry/solids/Boolean/include/G4PIntersectionSolid.ddl
+22
View File
@@ -1,3 +1,25 @@
//
// ********************************************************************
// * 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. *
// ********************************************************************
//
// Persistent class for description of intersection of two CSG solids
//
// History:
source/persistency/geometry/solids/Boolean/include/G4PSubtractionSolid.ddl
+22
View File
@@ -1,3 +1,25 @@
//
// ********************************************************************
// * 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. *
// ********************************************************************
//
// Persistent class for description of subtraction of two CSG solids: A - B
//
// History:
source/persistency/geometry/solids/Boolean/include/G4PUnionSolid.ddl
+22
View File
@@ -1,3 +1,25 @@
//
// ********************************************************************
// * 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. *
// ********************************************************************
//
// Persistent class for description of intersection of two CSG solids
//
// History:
source/persistency/geometry/solids/Boolean/src/G4PBooleanSolid.cc
+22
View File
@@ -1,3 +1,25 @@
//
// ********************************************************************
// * 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. *
// ********************************************************************
//
// Persistent base class for solids created by boolean operations
// between other solids
//
source/persistency/geometry/solids/Boolean/src/G4PDisplacedSolid.cc
+22
View File
@@ -1,3 +1,25 @@
//
// ********************************************************************
// * 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. *
// ********************************************************************
//
// Persistent class describing solid placements for boolean operations
//
// History:
source/persistency/geometry/solids/Boolean/src/G4PIntersectionSolid.cc
+22
View File
@@ -1,3 +1,25 @@
//
// ********************************************************************
// * 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. *
// ********************************************************************
//
// Persistent class for description of intersection of two CSG solids
//
// History:
source/persistency/geometry/solids/Boolean/src/G4PSubtractionSolid.cc
+22
View File
@@ -1,3 +1,25 @@
//
// ********************************************************************
// * 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. *
// ********************************************************************
//
// Persistent class for description of subtraction of two CSG solids: A - B
//
// History:
source/persistency/geometry/solids/Boolean/src/G4PUnionSolid.cc
+22
View File
@@ -1,3 +1,25 @@
//
// ********************************************************************
// * 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. *
// ********************************************************************
//
// Persistent class for description of intersection of two CSG solids
//
// History:
source/persistency/geometry/solids/CSG/GNUmakefile
+5 -4
View File
@@ -1,19 +1,20 @@
# $Id: GNUmakefile,v 1.8 1999/12/01 15:21:07 morita Exp $
# $Id: GNUmakefile,v 1.9 2001/03/15 22:58:54 morita Exp $
name := G4pcsg
G4ODBMS := true
G4ODBMS_INSTALLATION := true
PWD := $(shell (dirname `pwd`/dummy | sed -e 's/ //g'))
ifndef G4INSTALL
G4INSTALL = ../../../../..
G4INSTALL = $(PWD)/../../../../..
endif
include $(G4INSTALL)/config/architecture.gmk
G4OODDLX_BOOT := $(G4TMPSCHEMA_BOOT)
G4OODDLX_BOOT := $(G4SCHEMA_BOOT)
CPPFLAGS += \
-Iinclude \
-I$(PWD)/include \
-I$(G4SCHEMA_HEADER_DIR) \
-I$(G4TMP)/$(G4SYSTEM)/G4pgeomGlobal \
-I$(G4BASE)/persistency/global/include \
source/persistency/geometry/solids/CSG/include/G4PBox.ddl
+23 -7
View File
@@ -1,12 +1,28 @@
// 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.
// ********************************************************************
// * 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: G4PBox.ddl,v 1.3 1999/12/15 14:51:24 gunter Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// $Id: G4PBox.ddl,v 1.3.4.1 2001/06/28 19:11:31 gunter Exp $
// GEANT4 tag $Name: $
//
// class G4PBox
//
source/persistency/geometry/solids/CSG/include/G4PCSGSolid.ddl
+23 -7
View File
@@ -1,12 +1,28 @@
// 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.
// ********************************************************************
// * 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: G4PCSGSolid.ddl,v 1.3 1999/12/15 14:51:24 gunter Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// $Id: G4PCSGSolid.ddl,v 1.3.4.1 2001/06/28 19:11:31 gunter Exp $
// GEANT4 tag $Name: $
//
//
// class G4CSGSolid
source/persistency/geometry/solids/CSG/include/G4PCons.ddl
+23 -7
View File
@@ -1,12 +1,28 @@
// 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.
// ********************************************************************
// * 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: G4PCons.ddl,v 1.3 1999/12/15 14:51:24 gunter Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// $Id: G4PCons.ddl,v 1.3.4.1 2001/06/28 19:11:31 gunter Exp $
// GEANT4 tag $Name: $
//
// class G4Cons
//
source/persistency/geometry/solids/CSG/include/G4PPara.ddl
+23 -9
View File
@@ -1,12 +1,28 @@
// 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.
// ********************************************************************
// * 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: G4PPara.ddl,v 1.4 1999/12/15 14:51:25 gunter Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// $Id: G4PPara.ddl,v 1.5.2.1 2001/06/28 19:11:31 gunter Exp $
// GEANT4 tag $Name: $
//
// class G4PPara
//
@@ -24,8 +40,6 @@ class G4Para;
class G4VSolid;
#include "G4ThreeVector.hh"
#include "g4rw/tvordvec.h"
typedef G4RWTValOrderedVector<G4ThreeVector> G4ThreeVectorList;
class G4PPara : public G4PCSGSolid {
public:
source/persistency/geometry/solids/CSG/include/G4PSphere.ddl
+23 -9
View File
@@ -1,12 +1,28 @@
// 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.
// ********************************************************************
// * 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: G4PSphere.ddl,v 1.4 1999/12/15 14:51:25 gunter Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// $Id: G4PSphere.ddl,v 1.5.2.1 2001/06/28 19:11:31 gunter Exp $
// GEANT4 tag $Name: $
//
// class G4PSphere
//
@@ -23,8 +39,6 @@ class G4VSolid;
class G4Sphere;
#include "G4ThreeVector.hh"
#include "g4rw/tvordvec.h"
typedef G4RWTValOrderedVector<G4ThreeVector> G4ThreeVectorList;
class G4PSphere : public G4PCSGSolid {
public:
source/persistency/geometry/solids/CSG/include/G4PTorus.ddl
+23 -7
View File
@@ -1,12 +1,28 @@
// 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.
// ********************************************************************
// * 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: G4PTorus.ddl,v 1.3 1999/12/15 14:51:25 gunter Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// $Id: G4PTorus.ddl,v 1.3.4.1 2001/06/28 19:11:31 gunter Exp $
// GEANT4 tag $Name: $
//
//
// class G4PTorus
source/persistency/geometry/solids/CSG/include/G4PTrap.ddl
+23 -9
View File
@@ -1,12 +1,28 @@
// 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.
// ********************************************************************
// * 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: G4PTrap.ddl,v 1.4 1999/12/15 14:51:25 gunter Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// $Id: G4PTrap.ddl,v 1.5.2.1 2001/06/28 19:11:31 gunter Exp $
// GEANT4 tag $Name: $
//
// class G4PTrap
//
@@ -23,8 +39,6 @@ class G4VSolid;
class G4Trap;
#include "G4ThreeVector.hh"
#include "g4rw/tvordvec.h"
typedef G4RWTValOrderedVector<G4ThreeVector> G4ThreeVectorList;
struct PTrapSidePlane
{
source/persistency/geometry/solids/CSG/include/G4PTrd.ddl
+23 -7
View File
@@ -1,12 +1,28 @@
// 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.
// ********************************************************************
// * 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: G4PTrd.ddl,v 1.3 1999/12/15 14:51:25 gunter Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// $Id: G4PTrd.ddl,v 1.3.4.1 2001/06/28 19:11:31 gunter Exp $
// GEANT4 tag $Name: $
//
// class G4PTrd
//
source/persistency/geometry/solids/CSG/include/G4PTubs.ddl
+23 -7
View File
@@ -1,12 +1,28 @@
// 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.
// ********************************************************************
// * 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: G4PTubs.ddl,v 1.3 1999/12/15 14:51:25 gunter Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// $Id: G4PTubs.ddl,v 1.3.4.1 2001/06/28 19:11:31 gunter Exp $
// GEANT4 tag $Name: $
//
//
// class G4PTubs
source/persistency/geometry/solids/CSG/src/G4PBox.cc
+23 -7
View File
@@ -1,12 +1,28 @@
// 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.
// ********************************************************************
// * 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: G4PBox.cc,v 1.2 1999/11/17 10:49:02 morita Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// $Id: G4PBox.cc,v 1.2.8.1 2001/06/28 19:11:31 gunter Exp $
// GEANT4 tag $Name: $
//
//
//
source/persistency/geometry/solids/CSG/src/G4PCSGSolid.cc
+23 -7
View File
@@ -1,12 +1,28 @@
// 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.
// ********************************************************************
// * 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: G4PCSGSolid.cc,v 1.2 1999/11/17 10:49:02 morita Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// $Id: G4PCSGSolid.cc,v 1.2.8.1 2001/06/28 19:11:32 gunter Exp $
// GEANT4 tag $Name: $
//
//
// History:
source/persistency/geometry/solids/CSG/src/G4PCons.cc
+23 -7
View File
@@ -1,12 +1,28 @@
// 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.
// ********************************************************************
// * 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: G4PCons.cc,v 1.2 1999/11/17 10:49:02 morita Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// $Id: G4PCons.cc,v 1.2.8.1 2001/06/28 19:11:32 gunter Exp $
// GEANT4 tag $Name: $
//
// class G4PCons
//
source/persistency/geometry/solids/CSG/src/G4PPara.cc
+23 -7
View File
@@ -1,12 +1,28 @@
// 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.
// ********************************************************************
// * 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: G4PPara.cc,v 1.2 1999/11/17 10:49:03 morita Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// $Id: G4PPara.cc,v 1.2.8.1 2001/06/28 19:11:32 gunter Exp $
// GEANT4 tag $Name: $
//
// class G4PPara
//
source/persistency/geometry/solids/CSG/src/G4PSphere.cc
+23 -7
View File
@@ -1,12 +1,28 @@
// 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.
// ********************************************************************
// * 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: G4PSphere.cc,v 1.3 1999/11/17 10:49:03 morita Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// $Id: G4PSphere.cc,v 1.3.8.1 2001/06/28 19:11:32 gunter Exp $
// GEANT4 tag $Name: $
//
//
// class G4PSphere
source/persistency/geometry/solids/CSG/src/G4PTorus.cc
+23 -7
View File
@@ -1,12 +1,28 @@
// 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.
// ********************************************************************
// * 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: G4PTorus.cc,v 1.3 1999/12/15 14:51:25 gunter Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// $Id: G4PTorus.cc,v 1.3.4.1 2001/06/28 19:11:32 gunter Exp $
// GEANT4 tag $Name: $
//
//
// class G4PTorus
source/persistency/geometry/solids/CSG/src/G4PTrap.cc
+23 -7
View File
@@ -1,12 +1,28 @@
// 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.
// ********************************************************************
// * 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: G4PTrap.cc,v 1.2 1999/11/17 10:49:03 morita Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// $Id: G4PTrap.cc,v 1.2.8.1 2001/06/28 19:11:32 gunter Exp $
// GEANT4 tag $Name: $
//
// class G4PTrap
//
source/persistency/geometry/solids/CSG/src/G4PTrd.cc
+23 -7
View File
@@ -1,12 +1,28 @@
// 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.
// ********************************************************************
// * 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: G4PTrd.cc,v 1.3 1999/12/15 14:51:25 gunter Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// $Id: G4PTrd.cc,v 1.3.4.1 2001/06/28 19:11:32 gunter Exp $
// GEANT4 tag $Name: $
//
//
// Implementation for G4Trd class
source/persistency/geometry/solids/CSG/src/G4PTubs.cc
+23 -7
View File
@@ -1,12 +1,28 @@
// 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.
// ********************************************************************
// * 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: G4PTubs.cc,v 1.2 1999/11/17 10:49:03 morita Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// $Id: G4PTubs.cc,v 1.2.8.1 2001/06/28 19:11:32 gunter Exp $
// GEANT4 tag $Name: $
//
//
// class G4PTubs
source/persistency/geometry/solids/specific/GNUmakefile
+5 -4
View File
@@ -1,19 +1,20 @@
# $Id: GNUmakefile,v 1.1 2000/05/11 10:09:07 morita Exp $
# $Id: GNUmakefile,v 1.2 2001/03/15 22:58:54 morita Exp $
name := G4pspecsolids
G4ODBMS := true
G4ODBMS_INSTALLATION := true
PWD := $(shell (dirname `pwd`/dummy | sed -e 's/ //g'))
ifndef G4INSTALL
G4INSTALL = ../../../../..
G4INSTALL = $(PWD)/../../../../..
endif
include $(G4INSTALL)/config/architecture.gmk
G4OODDLX_BOOT := $(G4TMPSCHEMA_BOOT)
G4OODDLX_BOOT := $(G4SCHEMA_BOOT)
CPPFLAGS += \
-Iinclude \
-I$(PWD)/include \
-I$(G4SCHEMA_HEADER_DIR) \
-I$(G4TMP)/$(G4SYSTEM)/G4pgeomGlobal \
-I$(G4TMP)/$(G4SYSTEM)/G4pcsg \
source/persistency/geometry/solids/specific/include/G4PHype.ddl
+23 -7
View File
@@ -1,12 +1,28 @@
// 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.
// ********************************************************************
// * 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: G4PHype.ddl,v 1.1 2000/05/11 10:10:11 morita Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// $Id: G4PHype.ddl,v 1.1.4.1 2001/06/28 19:11:32 gunter Exp $
// GEANT4 tag $Name: $
//
// class G4PHype
//
source/persistency/geometry/solids/specific/src/G4PHype.cc
+23 -7
View File
@@ -1,12 +1,28 @@
// 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.
// ********************************************************************
// * 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: G4PHype.cc,v 1.1 2000/05/11 10:10:16 morita Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// $Id: G4PHype.cc,v 1.1.4.1 2001/06/28 19:11:33 gunter Exp $
// GEANT4 tag $Name: $
//
// class G4PHype
//