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

Import Geant4 10.3.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-12-09 12:35:28 +01:00
parent 4ec577e5c4
commit a3452e42ac
3514 changed files with 210500 additions and 89628 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/extended/eventgenerator/pythia/decayer6/src/G4Pythia6Decayer.cc
+1 -2
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4Pythia6Decayer.cc 81443 2014-05-28 14:26:55Z gcosmo $
// $Id: G4Pythia6Decayer.cc 100687 2016-10-31 11:20:33Z gcosmo $
//
/// \file eventgenerator/pythia/decayer6/src/G4Pythia6Decayer.cc
/// \brief Implementation of the G4Pythia6Decayer class
@@ -79,7 +79,6 @@ G4Pythia6Decayer::~G4Pythia6Decayer()
// private methods
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
G4ParticleDefinition* G4Pythia6Decayer::
examples/extended/eventgenerator/pythia/decayer6/src/G4Pythia6DecayerMessenger.cc
+1 -1
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4Pythia6DecayerMessenger.cc 72244 2013-07-12 08:49:56Z gcosmo $
// $Id: G4Pythia6DecayerMessenger.cc 100687 2016-10-31 11:20:33Z gcosmo $
//
/// \file eventgenerator/pythia/decayer6/src/G4Pythia6DecayerMessenger.cc
/// \brief Implementation of the G4Pythia6DecayerMessenger class
examples/extended/eventgenerator/pythia/decayer6/src/P6DExtDecayerPhysics.cc
+6 -5
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: P6DExtDecayerPhysics.cc 72244 2013-07-12 08:49:56Z gcosmo $
// $Id: P6DExtDecayerPhysics.cc 100687 2016-10-31 11:20:33Z gcosmo $
//
/// \file eventgenerator/pythia/decayer6/src/P6DExtDecayerPhysics.cc
/// \brief Implementation of the P6DExtDecayerPhysics class
@@ -75,15 +75,16 @@ void P6DExtDecayerPhysics::ConstructProcess()
extDecayer->SetVerboseLevel(1);
// The extDecayer will be deleted in G4Decay destructor
aParticleIterator->reset();
while ((*aParticleIterator)())
auto particleIterator=GetParticleIterator();
particleIterator->reset();
while ((*particleIterator)())
{
G4ParticleDefinition* particle = aParticleIterator->value();
G4ParticleDefinition* particle = particleIterator->value();
G4ProcessManager* pmanager = particle->GetProcessManager();
if ( verboseLevel > 1 ) {
G4cout << "Setting ext decayer for: "
<< aParticleIterator->value()->GetParticleName()
<< particleIterator->value()->GetParticleName()
<< G4endl;
}
examples/extended/eventgenerator/pythia/decayer6/src/Pythia6.cc
+16 -2
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: Pythia6.cc 72244 2013-07-12 08:49:56Z gcosmo $
// $Id: Pythia6.cc 100687 2016-10-31 11:20:33Z gcosmo $
//
/// \file eventgenerator/pythia/decayer6/src/Pythia6.cc
/// \brief Implementation of the Pythia6 class
@@ -104,12 +104,20 @@
# define type_of_call _stdcall
#endif
// pythia6 functions
extern "C" {
int type_of_call pycomp(int *kf);
void type_of_call py1ent(int&, int&, double&, double&, double&);
void* pythia6_common_address(const char*);
}
// Direct declaration of pythia6 common blocks
// extern "C" {
// extern Pyjets_t pyjets_;
// extern Pydat1_t pydat1_;
// extern Pydat3_t pydat3_;
// }
Pythia6* Pythia6::fgInstance = 0;
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -144,10 +152,16 @@ Pythia6::Pythia6()
fParticles = new ParticleVector();
// initialize common-blocks
// Initialize common-blocks
fPyjets = (Pyjets_t*) pythia6_common_address("PYJETS");
fPydat1 = (Pydat1_t*) pythia6_common_address("PYDAT1");
fPydat3 = (Pydat3_t*) pythia6_common_address("PYDAT3");
// Alternative way to initialize common-blocks
// usind direct declaration of pythia6 common blocks
// fPyjets = &pyjets_;
// fPydat1 = &pydat1_;
// fPydat3 = &pydat3_;
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
examples/extended/eventgenerator/pythia/decayer6/src/pythia6_common_address.c
+5 -7
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: pythia6_common_address.c 72244 2013-07-12 08:49:56Z gcosmo $
// $Id: pythia6_common_address.c 100687 2016-10-31 11:20:33Z gcosmo $
//
// According to pythia6_common_address.c provided in Root
// Pythia6 distribution:
@@ -49,16 +49,14 @@
# define type_of_call _stdcall
#endif
int pyjets[2+5*4000+2*2*5*4000];
int pydat1[200+2*200+200+2*200];
int pydat3[3*500+2*8000+2*8000+5*8000]; /* KNDCAY=8000 */
extern int pyjets[2+5*4000+2*2*5*4000];
extern int pydat1[200+2*200+200+2*200];
extern int pydat3[3*500+2*8000+2*8000+5*8000]; /* KNDCAY=8000 */
void *pythia6_common_address(const char* name)
void* pythia6_common_address(const char* name)
{
if (!strcmp(name,"PYJETS")) return pyjets;
else if (!strcmp(name,"PYDAT1")) return pydat1;
else if (!strcmp(name,"PYDAT3")) return pydat3;
return 0;
}