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

Import Geant4 3.0.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-08 15:55:53 +02:00
parent e7d7193284
commit cfcb558cfe
3050 changed files with 91703 additions and 48310 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/g3tog4/src/G3CalcParams.cc
-161
View File
@@ -1,161 +0,0 @@
// 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: G3CalcParams.cc,v 1.3 1999/12/15 14:49:42 gunter Exp $
// GEANT4 tag $Name: geant4-02-00 $
//
// Change: G3CalcParamsFn returns true only in case
// the parameters *after* processing this method
// remain negative
//
// modified by I.Hrivnacova, 27 Sep 99
#include "globals.hh"
G4bool G3CalcParamsFn(G4double* Rpar, G4int npar, G4double* Rparm,
G4String shape, G4String shapem);
G4bool G3CalcParamsFn(G4double *Rpar, G4int npar, G4double *Rparm,
G4String shape, G4String shapem)
{
G4bool NegPresent = FALSE;
// for normal single volume positioning, just substitute for the
// negative parameters
// treat only the legal cases
if (shapem == shape) {
if (shape == "BOX" || shape == "TRD1" || shape == "TRD2") {
for (G4int i=0;i<npar;i++) {
if (Rpar[i] < 0) {
if (Rparm != 0) Rpar[i] = Rparm[i];
if (Rpar[i] < 0) NegPresent = TRUE;
}
}
}
if (shape == "TRAP") {
for (G4int i=0;i<11;i++) {
if (i != 1 && i != 2 && i != 6 && i != 10) {
if (Rpar[i]<0) {
if (Rparm != 0) Rpar[i] = Rparm[i];
if (Rpar[i] < 0) NegPresent = TRUE;
}
}
}
}
if (shape == "TUBE" || shape == "TUBS" || shape == "PARA") {
for (G4int i=0;i<3;i++) {
if (Rpar[i] < 0) {
if (Rparm != 0) Rpar[i] = Rparm[i];
if (Rpar[i] < 0) NegPresent = TRUE;
}
}
}
if (shape == "CONE" || shape == "CONS") {
for (G4int i=0;i<5;i++) {
if (Rpar[i] < 0) {
if (Rparm != 0) Rpar[i] = Rparm[i];
if (Rpar[i] < 0) NegPresent = TRUE;
}
}
}
if (shape == "SPHE") {
for (G4int i=0;i<2;i++) {
if (Rpar[i] < 0) {
if (Rparm != 0) Rpar[i] = Rparm[i];
if (Rpar[i] < 0) NegPresent = TRUE;
}
}
}
if (shape == "PGON") {
G4int nz = int(Rpar[3]);
G4int ipl;
for (G4int i=0;i<nz;i++) {
ipl = 5 + i*3;
if (Rpar[ipl] < 0) {
if (Rparm != 0) Rpar[ipl] = Rparm[ipl];
if (Rpar[ipl] < 0) NegPresent = TRUE;
}
if (Rpar[ipl+1] < 0) {
if (Rparm != 0) Rpar[ipl] = Rparm[ipl];
if (Rpar[ipl] < 0) NegPresent = TRUE;
}
}
}
if (shape == "PCON") {
G4int nz = int(Rpar[2]);
G4int ipl;
for (G4int i=0;i<nz;i++) {
ipl = 4 + i*3;
if (Rpar[ipl] < 0) {
if (Rparm != 0) Rpar[ipl] = Rparm[ipl];
if (Rpar[ipl] < 0) NegPresent = TRUE;
}
if (Rpar[ipl+1] < 0) {
// TO DO
// check - folowing argument might be ipl+1
if (Rparm != 0) Rpar[ipl] = Rparm[ipl];
if (Rpar[ipl] < 0) NegPresent = TRUE;
}
}
}
}
if (shape == "BOX") {
if (shapem == "TRD1") {
if (Rpar[1] < 0) {
if (Rparm != 0) Rpar[1] = Rparm[2];
if (Rpar[1] < 0) NegPresent = TRUE;
}
if (Rpar[2] < 0) {
if (Rparm != 0) Rpar[2] = Rparm[3];
if (Rpar[2] < 0) NegPresent = TRUE;
}
if (Rpar[0] < 0) {
if (Rparm != 0) Rpar[0] = G4std::min(Rparm[0],Rparm[1]) +
abs(Rparm[0]-Rparm[1])*.5*Rpar[2]/Rparm[3];
if (Rpar[0] < 0) NegPresent = TRUE;
}
}
if (shapem == "TRD2") {
if (Rpar[2] < 0) {
if (Rparm != 0) Rpar[2] = Rparm[4];
if (Rpar[2]<0) NegPresent = TRUE;
}
if (Rpar[0] < 0) {
if (Rparm != 0) Rpar[0] = G4std::min(Rparm[0],Rparm[1]) +
abs(Rparm[0]-Rparm[1])*.5*Rpar[2]/Rparm[4];
if (Rpar[0]<0) NegPresent = TRUE;
}
if (Rpar[1] < 0) {
if (Rparm != 0) Rpar[1] = G4std::min(Rparm[2],Rparm[3]) +
abs(Rparm[2]-Rparm[3])*.5*Rpar[2]/Rparm[4];
if (Rpar[1]<0) NegPresent = TRUE;
}
}
if (shapem == "TRAP") {
if (Rpar[2] < 0) {
if (Rparm != 0) Rpar[2] = Rparm[0];
if (Rpar[2] < 0) NegPresent = TRUE;
}
if (Rpar[0] < 0) {
if (Rparm != 0) {
G4double xlo = G4std::min(Rparm[4],Rparm[8]) +
abs(Rparm[4]-Rparm[8])*.5*Rpar[2]/Rparm[0];
G4double xhi = G4std::min(Rparm[5],Rparm[9]) +
abs(Rparm[5]-Rparm[9])*.5*Rpar[2]/Rparm[0];
Rpar[0] = G4std::min(xlo,xhi);
}
if (Rpar[0] < 0) NegPresent = TRUE;
}
if (Rpar[1] < 0) {
if (Rparm != 0) Rpar[1] = G4std::min(Rparm[3],Rparm[7]) +
abs(Rparm[3]-Rparm[7])*.5*Rpar[2]/Rparm[0];
if (Rpar[1] < 0) NegPresent = TRUE;
}
}
}
return NegPresent;
}
source/g3tog4/src/G3DetTable.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G3DetTable.cc,v 1.9 2000/03/02 17:54:05 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
#include "globals.hh"
#include "G3DetTable.hh"
source/g3tog4/src/G3DetTableEntry.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G3DetTableEntry.cc,v 1.3 2000/03/02 17:54:06 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
#include "globals.hh"
#include "G3DetTableEntry.hh"
source/g3tog4/src/G3Division.cc
+8 -7
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G3Division.cc,v 1.6 2000/03/02 17:54:06 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// $Id: G3Division.cc,v 1.7 2000/11/24 09:50:12 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// by I.Hrivnacova, V.Berejnoi 13.10.99
@@ -14,7 +14,6 @@
#include "G3VolTableEntry.hh"
#include "G3toG4MakeSolid.hh"
#include "G3Pos.hh"
#include "G3toG4Debug.hh"
#include "G4LogicalVolume.hh"
#include "G4VPhysicalVolume.hh"
#include "G4PVPlacement.hh"
@@ -109,13 +108,15 @@ G4VPhysicalVolume* G3Division::CreatePVReplica()
G4PVReplica* pvol
= new G4PVReplica(name, lv, mlv, fAxis, fNofDivisions, fWidth, fOffset);
if (G3toG4Debug() != 0) {
#ifdef G3G4DEBUG
G4cout << "Create G4PVReplica name " << name << " logical volume name "
<< lv->GetName() << " mother logical volme name "
<< mlv->GetName() << " axis " << fAxis << " ndivisions "
<< fNofDivisions << " width " << fWidth << " Offset "
<< fOffset << G4endl;
}
#endif
return pvol;
}
@@ -367,10 +368,10 @@ void G3Division::SetRangeAndAxis()
}
// verbose
if (G3toG4Debug() != 0) {
#ifdef G3G4DEBUG
G4cout << "Shape " << shape << " SetRangeAndAxis: "
<< fLowRange << " " << fHighRange << " " << fAxis << G4endl;
}
#endif
}
G3VolTableEntry* G3Division::CreateEnvelope(G4String shape, G4double hi,
source/g3tog4/src/G3EleTable.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G3EleTable.cc,v 1.9 2000/03/02 17:54:06 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
#include "G4strstreambuf.hh"
source/g3tog4/src/G3MatTable.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G3MatTable.cc,v 1.12 1999/12/05 17:50:09 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// by I.Hrivnacova, 27 Sep 99
source/g3tog4/src/G3MatTableEntry.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G3MatTableEntry.cc,v 1.2 1999/12/05 17:50:09 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// by I.Hrivnacova, 27 Sep 99
source/g3tog4/src/G3MedTable.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G3MedTable.cc,v 1.10 1999/12/05 17:50:09 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// by I.Hrivnacova, 27 Sep 99
source/g3tog4/src/G3MedTableEntry.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G3MedTableEntry.cc,v 1.2 1999/12/05 17:50:09 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// by I.Hrivnacova, 27 Sep 99
source/g3tog4/src/G3NegVolPars.cc
+148 -6
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G3NegVolPars.cc,v 1.6 2000/03/07 10:51:40 stesting Exp $
// GEANT4 tag $Name: geant4-02-00 $
// $Id: G3NegVolPars.cc,v 1.7 2000/11/24 09:50:12 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// modified by I. Hrivnacova, 13.10.99
@@ -16,11 +16,153 @@
#include "G3toG4.hh"
#include <math.h>
G4bool G3CalcParamsFn(G4double* Rpar, G4int npar, G4double* Rparm,
G4String shape, G4String shapem);
G4bool G3CalcParamsFn(G4double *Rpar, G4int npar, G4double *Rparm,
G4String shape, G4String shapem)
// Returns true only in case the parameters *after* processing
// this method remain negative.
{
G4bool NegPresent = FALSE;
// for normal single volume positioning, just substitute for the
// negative parameters
// treat only the legal cases
if (shapem == shape) {
if (shape == "BOX" || shape == "TRD1" || shape == "TRD2" ||
shape == "ELTU") {
for (G4int i=0;i<npar;i++) {
if (Rpar[i] < 0) {
if (Rparm != 0) Rpar[i] = Rparm[i];
if (Rpar[i] < 0) NegPresent = TRUE;
}
}
}
if (shape == "TRAP") {
for (G4int i=0;i<11;i++) {
if (i != 1 && i != 2 && i != 6 && i != 10) {
if (Rpar[i]<0) {
if (Rparm != 0) Rpar[i] = Rparm[i];
if (Rpar[i] < 0) NegPresent = TRUE;
}
}
}
}
if (shape == "TUBE" || shape == "TUBS" || shape == "PARA") {
for (G4int i=0;i<3;i++) {
if (Rpar[i] < 0) {
if (Rparm != 0) Rpar[i] = Rparm[i];
if (Rpar[i] < 0) NegPresent = TRUE;
}
}
}
if (shape == "CONE" || shape == "CONS") {
for (G4int i=0;i<5;i++) {
if (Rpar[i] < 0) {
if (Rparm != 0) Rpar[i] = Rparm[i];
if (Rpar[i] < 0) NegPresent = TRUE;
}
}
}
if (shape == "SPHE") {
for (G4int i=0;i<2;i++) {
if (Rpar[i] < 0) {
if (Rparm != 0) Rpar[i] = Rparm[i];
if (Rpar[i] < 0) NegPresent = TRUE;
}
}
}
if (shape == "PGON") {
G4int nz = int(Rpar[3]);
G4int ipl;
for (G4int i=0;i<nz;i++) {
ipl = 5 + i*3;
if (Rpar[ipl] < 0) {
if (Rparm != 0) Rpar[ipl] = Rparm[ipl];
if (Rpar[ipl] < 0) NegPresent = TRUE;
}
if (Rpar[ipl+1] < 0) {
if (Rparm != 0) Rpar[ipl] = Rparm[ipl];
if (Rpar[ipl] < 0) NegPresent = TRUE;
}
}
}
if (shape == "PCON") {
G4int nz = int(Rpar[2]);
G4int ipl;
for (G4int i=0;i<nz;i++) {
ipl = 4 + i*3;
if (Rpar[ipl] < 0) {
if (Rparm != 0) Rpar[ipl] = Rparm[ipl];
if (Rpar[ipl] < 0) NegPresent = TRUE;
}
if (Rpar[ipl+1] < 0) {
// TO DO
// check - folowing argument might be ipl+1
if (Rparm != 0) Rpar[ipl] = Rparm[ipl];
if (Rpar[ipl] < 0) NegPresent = TRUE;
}
}
}
}
G4bool G3NegVolPars(G4double pars[], G4int *nparpt,
G3VolTableEntry* vte, G3VolTableEntry* mvte, const char routine[])
if (shape == "BOX") {
if (shapem == "TRD1") {
if (Rpar[1] < 0) {
if (Rparm != 0) Rpar[1] = Rparm[2];
if (Rpar[1] < 0) NegPresent = TRUE;
}
if (Rpar[2] < 0) {
if (Rparm != 0) Rpar[2] = Rparm[3];
if (Rpar[2] < 0) NegPresent = TRUE;
}
if (Rpar[0] < 0) {
if (Rparm != 0) Rpar[0] = G4std::min(Rparm[0],Rparm[1]) +
abs(Rparm[0]-Rparm[1])*.5*Rpar[2]/Rparm[3];
if (Rpar[0] < 0) NegPresent = TRUE;
}
}
if (shapem == "TRD2") {
if (Rpar[2] < 0) {
if (Rparm != 0) Rpar[2] = Rparm[4];
if (Rpar[2]<0) NegPresent = TRUE;
}
if (Rpar[0] < 0) {
if (Rparm != 0) Rpar[0] = G4std::min(Rparm[0],Rparm[1]) +
abs(Rparm[0]-Rparm[1])*.5*Rpar[2]/Rparm[4];
if (Rpar[0]<0) NegPresent = TRUE;
}
if (Rpar[1] < 0) {
if (Rparm != 0) Rpar[1] = G4std::min(Rparm[2],Rparm[3]) +
abs(Rparm[2]-Rparm[3])*.5*Rpar[2]/Rparm[4];
if (Rpar[1]<0) NegPresent = TRUE;
}
}
if (shapem == "TRAP") {
if (Rpar[2] < 0) {
if (Rparm != 0) Rpar[2] = Rparm[0];
if (Rpar[2] < 0) NegPresent = TRUE;
}
if (Rpar[0] < 0) {
if (Rparm != 0) {
G4double xlo = G4std::min(Rparm[4],Rparm[8]) +
abs(Rparm[4]-Rparm[8])*.5*Rpar[2]/Rparm[0];
G4double xhi = G4std::min(Rparm[5],Rparm[9]) +
abs(Rparm[5]-Rparm[9])*.5*Rpar[2]/Rparm[0];
Rpar[0] = G4std::min(xlo,xhi);
}
if (Rpar[0] < 0) NegPresent = TRUE;
}
if (Rpar[1] < 0) {
if (Rparm != 0) Rpar[1] = G4std::min(Rparm[3],Rparm[7]) +
abs(Rparm[3]-Rparm[7])*.5*Rpar[2]/Rparm[0];
if (Rpar[1] < 0) NegPresent = TRUE;
}
}
}
return NegPresent;
}
G4bool G3NegVolPars(G4double pars[], G4int *nparpt,
G3VolTableEntry* vte,
G3VolTableEntry* mvte, const char routine[])
{
G4bool NegPresent = FALSE;
source/g3tog4/src/G3PartTable.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G3PartTable.cc,v 1.9 2000/03/02 17:54:06 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
#include "g4std/strstream"
source/g3tog4/src/G3Pos.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G3Pos.cc,v 1.7 2000/03/02 17:54:06 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// modified by I.Hrivnacova, 13.10.99
source/g3tog4/src/G3RotTable.cc
+4 -3
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G3RotTable.cc,v 1.11 1999/12/05 17:50:10 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// $Id: G3RotTable.cc,v 1.12 2000/07/24 11:32:14 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// by I.Hrivnacova, 27 Sep 99
@@ -19,7 +19,8 @@ G3RotTable::G3RotTable()
G3RotTable::~G3RotTable()
{
fRotVector->clearAndDestroy();
fRotVector->clear();
//fRotVector->clearAndDestroy();
delete fRotVector;
}
source/g3tog4/src/G3RotTableEntry.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G3RotTableEntry.cc,v 1.2 1999/12/05 17:50:10 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// by I.Hrivnacova, 27 Sep 99
source/g3tog4/src/G3VolTable.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G3VolTable.cc,v 1.19 2000/03/02 17:54:07 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// modified by I.Hrivnacova, 13.10.99
source/g3tog4/src/G3VolTableEntry.cc
+13 -3
View File
@@ -5,17 +5,17 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G3VolTableEntry.cc,v 1.4 2000/03/02 17:54:07 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// $Id: G3VolTableEntry.cc,v 1.6 2000/11/28 12:07:54 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// modified by I.Hrivnacova, 13.10.99
#include "globals.hh"
#include "G3VolTableEntry.hh"
#include "G3VolTable.hh"
#include "G4LogicalVolume.hh"
#include "G3Pos.hh"
#include "G3toG4.hh"
#include "globals.hh"
G3VolTableEntry::G3VolTableEntry(G4String& vname, G4String& shape,
G4double* rpar, G4int npar, G4int nmed,
@@ -169,6 +169,16 @@ void G3VolTableEntry::SetHasNegPars(G4bool hasNegPars) {
fHasNegPars = hasNegPars;
}
void G3VolTableEntry::ClearG3PosCopy(G4int copy) {
if (fG3Pos.entries()>0 && copy>=0 && copy<fG3Pos.entries())
fG3Pos.removeAt(copy);
}
void G3VolTableEntry::ClearDivision() {
delete fDivision;
fDivision = 0;
}
G4String
G3VolTableEntry::GetName() {
return fVname;
source/g3tog4/src/G3fillParams.cc.archive
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G3fillParams.cc.archive,v 1.1 1999/12/06 19:19:57 lockman Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// extracted from clparse.cc by I. Hrivnacova, 30.7.99
source/g3tog4/src/G3toG4BuildTree.cc
+15 -8
View File
@@ -5,11 +5,12 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G3toG4BuildTree.cc,v 1.11 1999/12/15 14:49:43 gunter Exp $
// GEANT4 tag $Name: geant4-02-00 $
// $Id: G3toG4BuildTree.cc,v 1.12 2000/11/24 09:50:13 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// modified by I. Hrivnacova, 2.8.99
#include "globals.hh"
#include "G3toG4BuildTree.hh"
#include "G3RotTable.hh"
#include "G3MedTable.hh"
@@ -18,8 +19,6 @@
#include "G3Pos.hh"
#include "G4LogicalVolume.hh"
#include "G4PVPlacement.hh"
#include "globals.hh"
#include "G3toG4Debug.hh"
void G3toG4BuildTree(G3VolTableEntry* curVTE, G3VolTableEntry* motherVTE)
{
@@ -66,7 +65,8 @@ void G3toG4BuildTree(G3VolTableEntry* curVTE, G3VolTableEntry* motherVTE)
for (G4int i=0; i<curVTE->NPCopies(); i++){
G3Pos* theG3Pos = curVTE->GetG3PosCopy(i);
if (theG3Pos->GetMotherName() == motherVTE->GetMasterClone()->GetName()) {
if (theG3Pos &&
theG3Pos->GetMotherName() == motherVTE->GetMasterClone()->GetName()) {
// rotation matrix
G4int irot = theG3Pos->GetIrot();
@@ -89,12 +89,16 @@ void G3toG4BuildTree(G3VolTableEntry* curVTE, G3VolTableEntry* motherVTE)
// verbose
if (G3toG4Debug() != 0)
#ifdef G3G4DEBUG
G4cout << "PV: " << i << "th copy of " << curVTE->GetName()
<< " in " << motherVTE->GetName() << " copyNo: "
<< copyNo << " irot: " << irot << " pos: "
<< *(theG3Pos->GetPos()) << G4endl;
#endif
}
// clear this position
curVTE->ClearG3PosCopy(i);
}
}
@@ -102,10 +106,13 @@ void G3toG4BuildTree(G3VolTableEntry* curVTE, G3VolTableEntry* motherVTE)
if (curVTE->GetDivision()) {
curVTE->GetDivision()->CreatePVReplica();
// verbose
if (G3toG4Debug() != 0) {
#ifdef G3G4DEBUG
G4cout << "CreatePVReplica: " << curVTE->GetName()
<< " in " << motherVTE->GetName() << G4endl;
}
#endif
// clear this divison
curVTE->ClearDivision();
}
}
else {
source/g3tog4/src/G3toG4Debug.cc
-17
View File
@@ -1,17 +0,0 @@
// 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: G3toG4Debug.cc,v 1.1 1999/12/09 01:27:49 lockman Exp $
// GEANT4 tag $Name: geant4-02-00 $
//
#include "G3toG4Debug.hh"
G4int
G3toG4Debug()
{
return 0;
}
source/g3tog4/src/G3toG4MakeSolid.cc
+15 -5
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G3toG4MakeSolid.cc,v 1.4 1999/12/15 14:49:43 gunter Exp $
// GEANT4 tag $Name: geant4-02-00 $
// $Id: G3toG4MakeSolid.cc,v 1.6 2000/08/01 09:08:41 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// modified by I.Hrivnacova, V.Berejnoi 27 Sep 99
@@ -22,6 +22,7 @@
#include "G4Polyhedra.hh"
#include "G4Para.hh"
#include "G4Hype.hh"
#include "G4EllipticalTube.hh"
#include "G3toG4MakeSolid.hh"
G4VSolid* G3toG4MakeSolid(const G4String& vname, const G4String& shape,
@@ -174,7 +175,7 @@ G4VSolid* G3toG4MakeSolid(const G4String& vname, const G4String& shape,
G4double pRmin2 = Rpar[3]*cm;
G4double pRmax2 = Rpar[4]*cm;
G4double pSPhi = Rpar[5]*deg;
G4double pDPhi = Rpar[6]- pSPhi;
G4double pDPhi = Rpar[6]*deg - pSPhi;
if ( Rpar[6]*deg <= pSPhi ) pDPhi = pDPhi + 360.*deg;
OKAxis[0]=OKAxis[1]=OKAxis[2]=true;
@@ -272,8 +273,17 @@ G4VSolid* G3toG4MakeSolid(const G4String& vname, const G4String& shape,
delete [] Rmax;
} else if ( shape == "ELTU" ) {
// $$$ not implemented.
G4cerr << "ELTU not supported" << G4endl;
G4double dX = Rpar[0]*cm;
G4double dY = Rpar[1]*cm;
G4double dZ = Rpar[2]*cm;
OKAxis[0]=OKAxis[1]=OKAxis[2]=true;
NegVolPars = dX<0 || dY<0 || dZ<0;
if (!(NegVolPars || Deferred)) {
solid = new G4EllipticalTube(vname, dX, dY, dZ);
}
} else if ( shape == "HYPE" ) {
G4double pRmin = Rpar[0]*cm;
source/g3tog4/src/G3toG4RotationMatrix.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G3toG4RotationMatrix.cc,v 1.2 1999/12/05 17:50:11 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
#include "G3toG4RotationMatrix.hh"
source/g3tog4/src/G4BuildGeom.cc
+5 -5
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4BuildGeom.cc,v 1.12 1999/12/15 14:49:43 gunter Exp $
// GEANT4 tag $Name: geant4-02-00 $
// $Id: G4BuildGeom.cc,v 1.13 2000/11/24 09:50:13 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
// modified by I. Hrivnacova, 13.10.99
@@ -14,7 +14,6 @@
#include "g4std/fstream"
#include "globals.hh"
#include "G3toG4.hh"
#include "G3toG4Debug.hh"
#include "G3MatTable.hh"
#include "G3MedTable.hh"
#include "G3RotTable.hh"
@@ -82,10 +81,11 @@ G4LogicalVolume* G4BuildGeom(G4String& inFile){
// check the geometry here
if (G3toG4Debug() != 0){
#ifdef G3G4DEBUG
G4cout << "scan through G4LogicalVolumeStore:" << G4endl;
checkVol();
}
#endif
return topLV;
}
source/g3tog4/src/G4ggclos.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4ggclos.cc,v 1.6 1999/12/15 14:49:43 gunter Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
#include "G3toG4.hh"
#include "G3VolTable.hh"
source/g3tog4/src/G4gsatt.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4gsatt.cc,v 1.8 2000/03/02 17:54:07 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
#include "g4rw/cstring.h"
#include "G3toG4.hh"
source/g3tog4/src/G4gsdet.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4gsdet.cc,v 1.3 1999/12/05 17:50:12 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
#include "globals.hh"
#include "G3toG4.hh"
source/g3tog4/src/G4gsdeta.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4gsdeta.cc,v 1.4 1999/12/05 17:50:12 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
//
// modified by I.Hrivnacova, 6 Oct 99
source/g3tog4/src/G4gsdetd.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4gsdetd.cc,v 1.4 1999/12/05 17:50:12 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
#include "G3toG4.hh"
#include "G3DetTable.hh"
source/g3tog4/src/G4gsdeth.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4gsdeth.cc,v 1.4 1999/12/05 17:50:12 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
#include "G3toG4.hh"
#include "G3DetTable.hh"
source/g3tog4/src/G4gsdetu.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4gsdetu.cc,v 1.3 1999/12/05 17:50:12 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
#include "G3toG4.hh"
source/g3tog4/src/G4gsdetv.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4gsdetv.cc,v 1.6 1999/12/15 14:49:43 gunter Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
#include "G4ios.hh"
#include "G3toG4.hh"
source/g3tog4/src/G4gsdk.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4gsdk.cc,v 1.3 1999/12/05 17:50:13 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
#include "G4Decay.hh"
#include "G3toG4.hh"
source/g3tog4/src/G4gsdvn.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4gsdvn.cc,v 1.5 1999/12/05 17:50:13 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// by I.Hrivnacova, V.Berejnoi, 29 Oct 99
source/g3tog4/src/G4gsdvn2.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4gsdvn2.cc,v 1.6 1999/12/05 17:50:13 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// by I.Hrivnacova, V.Berejnoi, 29 Oct 99
source/g3tog4/src/G4gsdvt.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4gsdvt.cc,v 1.5 1999/12/05 17:50:13 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// by I.Hrivnacova, V.Berejnoi, 29 Oct 99
source/g3tog4/src/G4gsdvt2.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4gsdvt2.cc,v 1.5 1999/12/05 17:50:13 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// by I.Hrivnacova, V.Berejnoi, 29 Oct 99
source/g3tog4/src/G4gsdvx.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4gsdvx.cc,v 1.3 1999/12/05 17:50:13 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// by I.Hrivnacova, V.Berejnoi, 27 Sep 99
source/g3tog4/src/G4gsmate.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4gsmate.cc,v 1.6 1999/12/15 14:49:43 gunter Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// by I.Hrivnacova, 27 Sep 99
source/g3tog4/src/G4gsmixt.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4gsmixt.cc,v 1.7 1999/12/15 14:49:43 gunter Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// by I.Hrivnacova, 27 Sep 99
source/g3tog4/src/G4gspart.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4gspart.cc,v 1.3 1999/12/05 17:50:14 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
#include "G4ProcessManager.hh"
#include "G3toG4.hh"
source/g3tog4/src/G4gspos.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4gspos.cc,v 1.11 1999/12/05 17:50:14 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// by I.Hrivnacova, 13.10.99
source/g3tog4/src/G4gsposp.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4gsposp.cc,v 1.13 2000/03/07 10:51:40 stesting Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// by I.Hrivnacova, 13.10.99
source/g3tog4/src/G4gsrotm.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4gsrotm.cc,v 1.8 1999/12/15 14:49:44 gunter Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
#include "G3toG4.hh"
#include "G3RotTable.hh"
source/g3tog4/src/G4gstmed.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4gstmed.cc,v 1.4 1999/12/05 17:50:14 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// The last G4int argument of G4gstmed(..) is used for sending
// info whether the Geant3 tracking medium parameters should
source/g3tog4/src/G4gstpar.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4gstpar.cc,v 1.5 1999/12/15 14:49:44 gunter Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
#include "G3toG4.hh"
#include "G3VolTable.hh"
source/g3tog4/src/G4gsvolu.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4gsvolu.cc,v 1.7 1999/12/15 14:49:44 gunter Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// by I.Hrivnacova, 13.10.99
source/g3tog4/src/README
-4
View File
@@ -1,4 +0,0 @@
g3tog4 converter routines.
History is maintained in README one level up, in g3tog4/README
source/g3tog4/src/clparse.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: clparse.cc,v 1.11 2000/03/07 10:51:41 stesting Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// modified by I.Hrivnacova
// added G3SensVol
source/g3tog4/src/g3routines.F
+1 -1
View File
@@ -6,7 +6,7 @@
* and all its terms.
*
* $Id: g3routines.F,v 1.3 1999/12/05 17:50:15 gcosmo Exp $
* GEANT4 tag $Name: geant4-02-00 $
* GEANT4 tag $Name: geant4-03-00 $
*
#define CALL_GEANT
source/g3tog4/src/g3test.F.main
+1 -1
View File
@@ -6,7 +6,7 @@
* and all its terms.
*
* $Id: g3test.F.main,v 1.2 1999/12/05 17:50:16 gcosmo Exp $
* GEANT4 tag $Name: geant4-02-00 $
* GEANT4 tag $Name: geant4-03-00 $
*
*
* g3test
source/g3tog4/src/g3tog4.F
+1 -1
View File
@@ -6,7 +6,7 @@
* and all its terms.
*
* $Id: g3tog4.F,v 1.3 1999/12/05 17:50:16 gcosmo Exp $
* GEANT4 tag $Name: geant4-02-00 $
* GEANT4 tag $Name: geant4-03-00 $
*
*
* G3toG4
source/g3tog4/src/g4geom.cc.main
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: g4geom.cc.main,v 1.2 1999/12/05 17:50:17 gcosmo Exp $
// GEANT4 tag $Name: geant4-02-00 $
// GEANT4 tag $Name: geant4-03-00 $
//
// g4geom
//
source/g3tog4/src/jshape.F
+1 -1
View File
@@ -6,7 +6,7 @@
* and all its terms.
*
* $Id: jshape.F,v 1.2 1999/12/05 17:50:17 gcosmo Exp $
* GEANT4 tag $Name: geant4-02-00 $
* GEANT4 tag $Name: geant4-03-00 $
*
*
*-- Author : Jouko Vuoskoski, CERN, Jouko.Vuoskoski@cern.ch
source/g3tog4/src/mztog4.F
+1 -1
View File
@@ -6,7 +6,7 @@
* and all its terms.
*
* $Id: mztog4.F,v 1.2 1999/12/05 17:50:17 gcosmo Exp $
* GEANT4 tag $Name: geant4-02-00 $
* GEANT4 tag $Name: geant4-03-00 $
*
subroutine mztog4
************************************************************************
source/g3tog4/src/rztog4.F
+1 -1
View File
@@ -6,7 +6,7 @@
* and all its terms.
*
* $Id: rztog4.F,v 1.2 1999/12/05 17:50:17 gcosmo Exp $
* GEANT4 tag $Name: geant4-02-00 $
* GEANT4 tag $Name: geant4-03-00 $
*
program rztog4
************************************************************************
source/g3tog4/src/tog4.F
+1 -1
View File
@@ -6,7 +6,7 @@
* and all its terms.
*
* $Id: tog4.F,v 1.3 1999/12/05 17:50:17 gcosmo Exp $
* GEANT4 tag $Name: geant4-02-00 $
* GEANT4 tag $Name: geant4-03-00 $
*
subroutine tog4
************************************************************************