Import Geant4 3.1.0 source tree
This commit is contained in:
@@ -78,6 +78,10 @@ Flibsources = $(filter-out $(Fbinsources),$(wildcard src/*.F))
|
||||
Flibobjects = $(patsubst src/%.F,$(G4TMPDIR)/%.o,$(Flibsources))
|
||||
Fdependencies = $(patsubst %.o,%.d,$(Fbinobjects) $(Flibobjects))
|
||||
|
||||
ifdef G3G4DEBUG
|
||||
CPPFLAGS += -DG3G4DEBUG
|
||||
endif
|
||||
|
||||
###############################################################################
|
||||
### user beware! .rz files made with cernlib v 95a cannot be read with later
|
||||
### versions. You can use cernlib -v option to specify the cernlib version
|
||||
|
||||
+18
-1
@@ -1,8 +1,25 @@
|
||||
$Id: History,v 1.38 2000/11/28 12:07:54 gcosmo Exp $
|
||||
$Id: History,v 1.42 2001/03/14 13:27:44 gcosmo Exp $
|
||||
|
||||
G3toG4 Modification History (reverse chronological order, please !)
|
||||
--------------------------------------------------------------------
|
||||
|
||||
g3tog4-V03-00-02 14-Mar-2001 G.Cosmo
|
||||
- G3toG4MakeSolid.cc: fixed bug in construction of G4Sphere where theta and
|
||||
phi parameters were reversed according to G4Sphere constructor.
|
||||
Fixes problem report #230.
|
||||
- G3Division.cc: correction for "PARA". Slices are placed with G4PVPlacement
|
||||
instead of G4PVReplica for this particular case (I.Hrivnacova).
|
||||
|
||||
g3tog4-V03-00-01 14-Feb-2001 G.Cosmo
|
||||
- Added support for replicated "PARA" shapes in G3Division::CreateSolid(...)
|
||||
(I.Hrivnacova).
|
||||
|
||||
g3tog4-V03-00-00 25-Jan-2001 G.Cosmo
|
||||
- Fixes for report #188:
|
||||
o Fixed bug in G3toG4BuildTree(G3VolTableEntry*, G3VolTableEntry*)
|
||||
when positioning volume copies. Index is now decremented.
|
||||
o Added -DG3G4DEBUG to CPPFLAGS in GNUmakefile.
|
||||
|
||||
g3tog4-V02-00-05 28-Nov-2000 G.Cosmo
|
||||
- Fixed bug in G3toG4BuildTree::ClearG3PosCopy(G4int). Entry in vector was
|
||||
not properly destroyed.
|
||||
|
||||
@@ -70,18 +70,19 @@ gmake clean
|
||||
- GSPART has to be updated.
|
||||
- Usage of magnetic field class has to be turned on.
|
||||
|
||||
the implementation (July 2000)
|
||||
the implementation (February 2001)
|
||||
----------------------------------------
|
||||
- Supported shapes: all G3 shapes except for
|
||||
"HYPE", "GTRA", "CTUB"
|
||||
- G3 MANY feature is not supported.
|
||||
- GSDV* routines for dividing volumes implemented, using
|
||||
G4PVReplicas, for shapes:
|
||||
"BOX", "TUBE", "TUBS" - all axes;
|
||||
"BOX", "TUBE", "TUBS", "PARA" - all axes;
|
||||
"CONE", "CONS" - axes 2, 3;
|
||||
"TRD1", "TRD2", "TRAP" - axis 3;
|
||||
"PGON", "PCON" - axis 2;
|
||||
"PARA" -axis 1; axis 2,3 for a special case
|
||||
Unsupported shapes:
|
||||
"SPHE", "PARA", "ELTU", "HYPE", "GTRA", "CTUB"
|
||||
"SPHE", "ELTU", "HYPE", "GTRA", "CTUB"
|
||||
|
||||
See History file for modification history.
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G3DetTable.hh,v 1.6 1999/12/15 14:49:42 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
// G3DetTable class
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G3DetTableEntry.hh,v 1.3 1999/12/09 01:27:42 lockman Exp $
|
||||
// GEANT4 tag $Name: geant4-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
// G3DetTableEntry class
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G3Division.hh,v 1.4 2000/11/24 09:50:09 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
// ----------------------
|
||||
// Class description:
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G3EleTable.hh,v 1.5 2000/11/24 09:50:09 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
// ----------------------
|
||||
// Class description:
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G3G4Interface.hh,v 1.7 1999/12/09 01:27:42 lockman Exp $
|
||||
// GEANT4 tag $Name: geant4-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
// Interfaces for G3 equivalent routines
|
||||
//
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G3MatTable.hh,v 1.9 2000/11/24 09:50:09 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
// ----------------------
|
||||
// Class description:
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G3MatTableEntry.hh,v 1.4 2000/11/24 09:50:09 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
// ----------------------
|
||||
// Class description:
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G3MedTable.hh,v 1.8 2000/11/24 09:50:09 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
// ----------------------
|
||||
// Class description:
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G3MedTableEntry.hh,v 1.4 2000/11/24 09:50:10 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
// ----------------------
|
||||
// Class description:
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G3PartTable.hh,v 1.7 2000/11/24 09:50:10 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
// ----------------------
|
||||
// Class description:
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G3Pos.hh,v 1.9 2000/11/24 09:50:10 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
// ----------------------
|
||||
// Class description:
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G3RotTable.hh,v 1.11 2000/11/24 09:50:10 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
// ----------------------
|
||||
// Class description:
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G3RotTableEntry.hh,v 1.4 2000/11/24 09:50:10 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
// ----------------------
|
||||
// Class description:
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G3SensVolVector.hh,v 1.3 1999/12/09 01:27:46 lockman Exp $
|
||||
// GEANT4 tag $Name: geant4-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
// vector of logical volumes that were defined with
|
||||
// tracking medium with ISVOL=1
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G3VolTable.hh,v 1.15 2000/11/24 09:50:10 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
// ----------------------
|
||||
// Class description:
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G3VolTableEntry.hh,v 1.4 2000/11/24 09:50:10 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
// ----------------------
|
||||
// Class description:
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G3toG4.hh,v 1.6 2000/03/07 10:51:40 stesting Exp $
|
||||
// GEANT4 tag $Name: geant4-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
// modified by I.Hrivnacova, 27 Sep 99
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
* and all its terms.
|
||||
*
|
||||
* $Id: G3toG4.inc,v 1.2 1999/12/05 17:50:04 gcosmo Exp $
|
||||
* GEANT4 tag $Name: geant4-03-00 $
|
||||
* GEANT4 tag $Name: geant4-03-01 $
|
||||
*
|
||||
integer maxlines
|
||||
parameter (maxlines = 750) ! max no. of cmd lines per C++ source file
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G3toG4BuildTree.hh,v 1.5 2000/11/24 09:50:10 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
// ----------------------
|
||||
// Class Description:
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G3toG4MakeSolid.hh,v 1.5 2000/11/24 09:50:11 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
// ----------------------
|
||||
// Class Description:
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G3toG4RotationMatrix.hh,v 1.4 2000/11/24 09:50:11 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
// ----------------------
|
||||
// Class description:
|
||||
//
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
* and all its terms.
|
||||
*
|
||||
* $Id: gcbank.inc,v 1.2 1999/12/05 17:50:05 gcosmo Exp $
|
||||
* GEANT4 tag $Name: geant4-03-00 $
|
||||
* GEANT4 tag $Name: geant4-03-01 $
|
||||
*
|
||||
INTEGER IQ,LQ,NZEBRA,IXSTOR,IXDIV,IXCONS,LMAIN,LR1,JCG
|
||||
INTEGER KWBANK,KWWORK,IWS
|
||||
|
||||
@@ -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-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
#include "globals.hh"
|
||||
#include "G3DetTable.hh"
|
||||
|
||||
@@ -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-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
#include "globals.hh"
|
||||
#include "G3DetTableEntry.hh"
|
||||
|
||||
@@ -5,20 +5,22 @@
|
||||
// based on the Program) you indicate your acceptance of this statement,
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G3Division.cc,v 1.7 2000/11/24 09:50:12 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-03-00 $
|
||||
// $Id: G3Division.cc,v 1.9 2001/03/14 13:27:23 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
// by I.Hrivnacova, V.Berejnoi 13.10.99
|
||||
|
||||
#include "G3Division.hh"
|
||||
#include "G3VolTableEntry.hh"
|
||||
#include "G3toG4MakeSolid.hh"
|
||||
#include "G4Para.hh"
|
||||
#include "G3Pos.hh"
|
||||
#include "G4LogicalVolume.hh"
|
||||
#include "G4VPhysicalVolume.hh"
|
||||
#include "G4PVPlacement.hh"
|
||||
#include "G4PVReplica.hh"
|
||||
|
||||
|
||||
G3VolTableEntry* G4CreateVTE(G4String vname, G4String shape, G4int nmed,
|
||||
G4double Rpar[], G4int npar);
|
||||
|
||||
@@ -89,7 +91,7 @@ void G3Division::UpdateVTE()
|
||||
|
||||
if (envVTE) {
|
||||
// reset mother <-> daughter
|
||||
fMVTE->ReplaceDaughter(fVTE, envVTE);
|
||||
fMVTE->ReplaceDaughter(fVTE, envVTE);
|
||||
fVTE->ReplaceMother(fMVTE, envVTE);
|
||||
envVTE->AddDaughter(fVTE);
|
||||
envVTE->AddMother(fMVTE);
|
||||
@@ -106,6 +108,26 @@ G4VPhysicalVolume* G3Division::CreatePVReplica()
|
||||
G4LogicalVolume* lv = fVTE->GetLV();
|
||||
G4LogicalVolume* mlv = fMVTE->GetLV();
|
||||
|
||||
G4String shape = fMVTE->GetShape();
|
||||
if (shape == "PARA") {
|
||||
// The para volume cannot be replicated using G4PVReplica.
|
||||
// (Replicating a volume along a cartesian axis means "slicing" it
|
||||
// with slices -perpendicular- to that axis.)
|
||||
|
||||
// position the replicated elements
|
||||
for (G4int i=0; i<fNofDivisions; i++) {
|
||||
G4ThreeVector position = G4ThreeVector();
|
||||
position[fIAxis-1] = fLowRange + fWidth/2. + i*fWidth;
|
||||
if (position.y()!=0.)
|
||||
position.setX(position.y()*((G4Para*)lv->GetSolid())->GetTanAlpha());
|
||||
|
||||
new G4PVPlacement(0, position, lv, name, mlv, 0, i);
|
||||
}
|
||||
|
||||
// no G4PVReplica was created - return 0
|
||||
return 0;
|
||||
}
|
||||
|
||||
G4PVReplica* pvol
|
||||
= new G4PVReplica(name, lv, mlv, fAxis, fNofDivisions, fWidth, fOffset);
|
||||
|
||||
@@ -650,7 +672,23 @@ void G3Division::CreateSolid(G4String shape, G4double par[], G4int npar)
|
||||
Rpar[0] = fWidth/2./cm;
|
||||
}
|
||||
}
|
||||
else if (shape == "SPHE" || shape == "PARA") {
|
||||
else if (shape == "PARA") {
|
||||
if ( fIAxis == 1 ) {
|
||||
Rpar[0] = fWidth/2./cm;
|
||||
}
|
||||
else if ( Rpar[4] == 0. && Rpar[5] == 0. ) {
|
||||
// only special case for axis 2,3 is supported
|
||||
if ( fIAxis == 2 ) {
|
||||
Rpar[1] = fWidth/2./cm;
|
||||
}
|
||||
else if ( fIAxis == 3) {
|
||||
Rpar[2] = fWidth/2./cm;
|
||||
}
|
||||
}
|
||||
else
|
||||
Exception("CreateSolid", shape);
|
||||
}
|
||||
else if (shape == "SPHE") {
|
||||
Exception("CreateSolid", shape);
|
||||
}
|
||||
else if ( shape == "PGON" ) {
|
||||
|
||||
@@ -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-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
|
||||
#include "G4strstreambuf.hh"
|
||||
|
||||
@@ -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-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
// by I.Hrivnacova, 27 Sep 99
|
||||
|
||||
|
||||
@@ -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-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
// by I.Hrivnacova, 27 Sep 99
|
||||
|
||||
|
||||
@@ -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-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
// by I.Hrivnacova, 27 Sep 99
|
||||
|
||||
|
||||
@@ -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-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
// by I.Hrivnacova, 27 Sep 99
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G3NegVolPars.cc,v 1.7 2000/11/24 09:50:12 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
// modified by I. Hrivnacova, 13.10.99
|
||||
|
||||
|
||||
@@ -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-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
|
||||
#include "g4std/strstream"
|
||||
|
||||
@@ -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-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
// modified by I.Hrivnacova, 13.10.99
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G3RotTable.cc,v 1.12 2000/07/24 11:32:14 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
// by I.Hrivnacova, 27 Sep 99
|
||||
|
||||
|
||||
@@ -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-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
// by I.Hrivnacova, 27 Sep 99
|
||||
|
||||
|
||||
@@ -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-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
// modified by I.Hrivnacova, 13.10.99
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G3VolTableEntry.cc,v 1.6 2000/11/28 12:07:54 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
// modified by I.Hrivnacova, 13.10.99
|
||||
|
||||
|
||||
@@ -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-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
// extracted from clparse.cc by I. Hrivnacova, 30.7.99
|
||||
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
// based on the Program) you indicate your acceptance of this statement,
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G3toG4BuildTree.cc,v 1.12 2000/11/24 09:50:13 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-03-00 $
|
||||
// $Id: G3toG4BuildTree.cc,v 1.13 2001/01/25 17:41:49 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
// modified by I. Hrivnacova, 2.8.99
|
||||
|
||||
@@ -98,7 +98,8 @@ void G3toG4BuildTree(G3VolTableEntry* curVTE, G3VolTableEntry* motherVTE)
|
||||
}
|
||||
|
||||
// clear this position
|
||||
curVTE->ClearG3PosCopy(i);
|
||||
curVTE->ClearG3PosCopy(i);
|
||||
i--;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
// based on the Program) you indicate your acceptance of this statement,
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G3toG4MakeSolid.cc,v 1.6 2000/08/01 09:08:41 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-03-00 $
|
||||
// $Id: G3toG4MakeSolid.cc,v 1.7 2001/03/12 09:49:16 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
// modified by I.Hrivnacova, V.Berejnoi 27 Sep 99
|
||||
|
||||
@@ -200,7 +200,7 @@ G4VSolid* G3toG4MakeSolid(const G4String& vname, const G4String& shape,
|
||||
NegVolPars = pRmin<0 || pRmax<0;
|
||||
|
||||
if (!(NegVolPars || Deferred)) {
|
||||
solid = new G4Sphere(vname, pRmin, pRmax, pThe1, pDThe, pPhi1, pDPhi);
|
||||
solid = new G4Sphere(vname, pRmin, pRmax, pPhi1, pDPhi, pThe1, pDThe);
|
||||
}
|
||||
|
||||
} else if ( shape == "PARA" ) {
|
||||
|
||||
@@ -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-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
|
||||
#include "G3toG4RotationMatrix.hh"
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4BuildGeom.cc,v 1.13 2000/11/24 09:50:13 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
// modified by I. Hrivnacova, 13.10.99
|
||||
|
||||
|
||||
@@ -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-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
|
||||
#include "G3toG4.hh"
|
||||
#include "G3VolTable.hh"
|
||||
|
||||
@@ -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-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
|
||||
#include "g4rw/cstring.h"
|
||||
#include "G3toG4.hh"
|
||||
|
||||
@@ -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-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
|
||||
#include "globals.hh"
|
||||
#include "G3toG4.hh"
|
||||
|
||||
@@ -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-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
//
|
||||
// modified by I.Hrivnacova, 6 Oct 99
|
||||
|
||||
@@ -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-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
|
||||
#include "G3toG4.hh"
|
||||
#include "G3DetTable.hh"
|
||||
|
||||
@@ -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-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
|
||||
#include "G3toG4.hh"
|
||||
#include "G3DetTable.hh"
|
||||
|
||||
@@ -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-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
|
||||
#include "G3toG4.hh"
|
||||
|
||||
|
||||
@@ -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-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
|
||||
#include "G4ios.hh"
|
||||
#include "G3toG4.hh"
|
||||
|
||||
@@ -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-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
|
||||
#include "G4Decay.hh"
|
||||
#include "G3toG4.hh"
|
||||
|
||||
@@ -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-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
// by I.Hrivnacova, V.Berejnoi, 29 Oct 99
|
||||
|
||||
|
||||
@@ -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-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
// by I.Hrivnacova, V.Berejnoi, 29 Oct 99
|
||||
|
||||
|
||||
@@ -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-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
// by I.Hrivnacova, V.Berejnoi, 29 Oct 99
|
||||
|
||||
|
||||
@@ -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-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
// by I.Hrivnacova, V.Berejnoi, 29 Oct 99
|
||||
|
||||
|
||||
@@ -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-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
// by I.Hrivnacova, V.Berejnoi, 27 Sep 99
|
||||
|
||||
|
||||
@@ -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-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
// by I.Hrivnacova, 27 Sep 99
|
||||
|
||||
|
||||
@@ -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-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
// by I.Hrivnacova, 27 Sep 99
|
||||
|
||||
|
||||
@@ -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-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
#include "G4ProcessManager.hh"
|
||||
#include "G3toG4.hh"
|
||||
|
||||
@@ -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-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
// by I.Hrivnacova, 13.10.99
|
||||
|
||||
|
||||
@@ -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-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
// by I.Hrivnacova, 13.10.99
|
||||
|
||||
|
||||
@@ -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-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
#include "G3toG4.hh"
|
||||
#include "G3RotTable.hh"
|
||||
|
||||
@@ -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-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
// The last G4int argument of G4gstmed(..) is used for sending
|
||||
// info whether the Geant3 tracking medium parameters should
|
||||
|
||||
@@ -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-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
#include "G3toG4.hh"
|
||||
#include "G3VolTable.hh"
|
||||
|
||||
@@ -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-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
// by I.Hrivnacova, 13.10.99
|
||||
|
||||
|
||||
@@ -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-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
// modified by I.Hrivnacova
|
||||
// added G3SensVol
|
||||
|
||||
@@ -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-03-00 $
|
||||
* GEANT4 tag $Name: geant4-03-01 $
|
||||
*
|
||||
#define CALL_GEANT
|
||||
|
||||
|
||||
@@ -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-03-00 $
|
||||
* GEANT4 tag $Name: geant4-03-01 $
|
||||
*
|
||||
*
|
||||
* g3test
|
||||
|
||||
@@ -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-03-00 $
|
||||
* GEANT4 tag $Name: geant4-03-01 $
|
||||
*
|
||||
*
|
||||
* G3toG4
|
||||
|
||||
@@ -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-03-00 $
|
||||
// GEANT4 tag $Name: geant4-03-01 $
|
||||
//
|
||||
// g4geom
|
||||
//
|
||||
|
||||
@@ -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-03-00 $
|
||||
* GEANT4 tag $Name: geant4-03-01 $
|
||||
*
|
||||
*
|
||||
*-- Author : Jouko Vuoskoski, CERN, Jouko.Vuoskoski@cern.ch
|
||||
|
||||
@@ -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-03-00 $
|
||||
* GEANT4 tag $Name: geant4-03-01 $
|
||||
*
|
||||
subroutine mztog4
|
||||
************************************************************************
|
||||
|
||||
@@ -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-03-00 $
|
||||
* GEANT4 tag $Name: geant4-03-01 $
|
||||
*
|
||||
program rztog4
|
||||
************************************************************************
|
||||
|
||||
@@ -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-03-00 $
|
||||
* GEANT4 tag $Name: geant4-03-01 $
|
||||
*
|
||||
subroutine tog4
|
||||
************************************************************************
|
||||
|
||||
Reference in New Issue
Block a user