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

Import Geant4 4.0.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-08 16:18:25 +02:00
parent 36c080dca6
commit 921d3b1cda
3990 changed files with 185376 additions and 82884 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/novice/N05/src/ExN05CalorimeterHit.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: ExN05CalorimeterHit.cc,v 1.2.4.1 2001/06/28 19:07:41 gunter Exp $
// GEANT4 tag $Name: $
// $Id: ExN05CalorimeterHit.cc,v 1.3 2001/07/11 09:58:34 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
#include "ExN05CalorimeterHit.hh"
examples/novice/N05/src/ExN05CalorimeterSD.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: ExN05CalorimeterSD.cc,v 1.2.4.1 2001/06/28 19:07:41 gunter Exp $
// GEANT4 tag $Name: $
// $Id: ExN05CalorimeterSD.cc,v 1.3 2001/07/11 09:58:34 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
#include "ExN05CalorimeterSD.hh"
examples/novice/N05/src/ExN05DetectorConstruction.cc
+19 -27
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: ExN05DetectorConstruction.cc,v 1.2.4.1 2001/06/28 19:07:42 gunter Exp $
// GEANT4 tag $Name: $
// $Id: ExN05DetectorConstruction.cc,v 1.4 2001/11/05 08:24:52 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
#include "ExN05DetectorConstruction.hh"
#include "ExN05CalorimeterSD.hh"
@@ -48,7 +48,7 @@
ExN05DetectorConstruction::ExN05DetectorConstruction()
{
theUserLimitsForCrystal = NULL;
theUserLimitsForCrystal = 0;
fUseUserLimits = false;
theMaxTimeCutsInCrystal = 1000.0 * ns;
theMinEkineCutsInCrystal = 1.0 * MeV;
@@ -58,7 +58,7 @@ ExN05DetectorConstruction::ExN05DetectorConstruction()
ExN05DetectorConstruction::~ExN05DetectorConstruction()
{
if (theUserLimitsForCrystal != NULL) delete theUserLimitsForCrystal;
if (theUserLimitsForCrystal != 0) delete theUserLimitsForCrystal;
delete theMessenger;
}
@@ -90,12 +90,6 @@ G4VPhysicalVolume* ExN05DetectorConstruction::Construct()
density = 0.1786e-03*g/cm3;
G4Material* He = new G4Material(name="He", z=2., a, density);
a = 26.98*g/mole;
density = 2.7*g/cm3;
G4Material* Al = new G4Material(name="Aluminium", z=13., a, density);
a = 207.19*g/mole;
density = 11.35*g/cm3;
G4Material* Pb = new G4Material(name="Lead", z=82., a, density);
a = 55.85*g/mole;
density = 7.87*g/cm3;
G4Material* Fe = new G4Material(name="Fer", z=26., a, density);
@@ -103,10 +97,6 @@ G4VPhysicalVolume* ExN05DetectorConstruction::Construct()
G4Material* Air = new G4Material(name="Air", density, nel=2);
Air->AddElement(elN, .7);
Air->AddElement(elO, .3);
//--------- G4VSolid, G4LogicalVolume, G4VPhysicalVolume ---------
@@ -130,13 +120,15 @@ G4VPhysicalVolume* ExN05DetectorConstruction::Construct()
// -- Logical volume:
G4Box *driftChamberBox
= new G4Box("DriftChamberSolid", detectSize, detectSize, 40*cm);
G4LogicalVolume *driftChamberLog = new G4LogicalVolume(driftChamberBox,He,
"DriftChamberLogical", 0, 0, 0);
G4LogicalVolume *driftChamberLog
= new G4LogicalVolume(driftChamberBox,He,
"DriftChamberLogical", 0, 0, 0);
// -- Placement:
G4PVPlacement *driftChamberPhys = new G4PVPlacement(0,G4ThreeVector(0., 0., 50*cm),
"DriftChamberPhysical",
driftChamberLog,
WorldPhys,false,0);
// G4PVPlacement *driftChamberPhys =
new G4PVPlacement(0,G4ThreeVector(0., 0., 50*cm),
"DriftChamberPhysical",
driftChamberLog,
WorldPhys,false,0);
//--------------------------
// "Calorimeter": used in
@@ -165,7 +157,7 @@ G4VPhysicalVolume* ExN05DetectorConstruction::Construct()
theCrystalLog = new G4LogicalVolume(CrystalSolid,CsI,
"CrystalLogical", 0, 0, 0);
// create UserLimits
if (theUserLimitsForCrystal != NULL) delete theUserLimitsForCrystal;
if (theUserLimitsForCrystal != 0) delete theUserLimitsForCrystal;
theUserLimitsForCrystal = new G4UserLimits( DBL_MAX, //step max
DBL_MAX, // track max
theMaxTimeCutsInCrystal,
@@ -292,11 +284,11 @@ G4VPhysicalVolume* ExN05DetectorConstruction::Construct()
//------------------ Parameterisation ------------------------------
// builds a model and sets it to the envelope of the calorimeter:
ExN05EMShowerModel* emShowerModel =
// ExN05EMShowerModel* emShowerModel =
new ExN05EMShowerModel("emShowerModel",calorimeterLog);
// and a model attached to the ghost:
ExN05PionShowerModel* ghostPionShowerModel =
// ExN05PionShowerModel* ghostPionShowerModel =
new ExN05PionShowerModel("ghostPionShowerModel",ghostLogical);
//--------- Visualization attributes -------------------------------
@@ -345,21 +337,21 @@ G4VPhysicalVolume* ExN05DetectorConstruction::Construct()
void ExN05DetectorConstruction::SetMaxTimeInCrystal(G4double value)
{
theMaxTimeCutsInCrystal = value;
if (theUserLimitsForCrystal != NULL) {
if (theUserLimitsForCrystal != 0) {
theUserLimitsForCrystal->SetUserMaxTime(value);
}
}
void ExN05DetectorConstruction::SetMinEkineInCrystal(G4double value)
{
theMinEkineCutsInCrystal = value;
if (theUserLimitsForCrystal != NULL) {
if (theUserLimitsForCrystal != 0) {
theUserLimitsForCrystal->SetUserMinEkine(value);
}
}
void ExN05DetectorConstruction::SetMinRangeInCrystal(G4double value)
{
theMinRangeCutsInCrystal = value;
if (theUserLimitsForCrystal != NULL) {
if (theUserLimitsForCrystal != 0) {
theUserLimitsForCrystal->SetUserMinRange(value);
}
}
@@ -367,7 +359,7 @@ void ExN05DetectorConstruction::SetMinRangeInCrystal(G4double value)
void ExN05DetectorConstruction::UseUserLimits(G4bool isUse)
{
fUseUserLimits = isUse;
if ( fUseUserLimits && (theUserLimitsForCrystal!= NULL)) {
if ( fUseUserLimits && (theUserLimitsForCrystal!= 0)) {
theCrystalLog->SetUserLimits(theUserLimitsForCrystal);
}
}
examples/novice/N05/src/ExN05DetectorMessenger.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: ExN05DetectorMessenger.cc,v 1.2.4.1 2001/06/28 19:07:42 gunter Exp $
// GEANT4 tag $Name: $
// $Id: ExN05DetectorMessenger.cc,v 1.3 2001/07/11 09:58:34 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
//
examples/novice/N05/src/ExN05EMShowerModel.cc
+16 -14
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: ExN05EMShowerModel.cc,v 1.3.2.1 2001/06/28 19:07:42 gunter Exp $
// GEANT4 tag $Name: $
// $Id: ExN05EMShowerModel.cc,v 1.6 2001/11/08 10:21:28 radoone Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
#include "ExN05EMShowerModel.hh"
#include "ExN05EnergySpot.hh"
@@ -35,7 +35,8 @@
#include "G4Gamma.hh"
#include "G4TransportationManager.hh"
#include "G4VSensitiveDetector.hh"
#include "G4VTouchable.hh"
#include "G4TouchableHandle.hh"
//#include "G4TouchableHistory.hh"
ExN05EMShowerModel::ExN05EMShowerModel(G4String modelName, G4LogicalVolume* envelope)
: G4VFastSimulationModel(modelName, envelope)
@@ -43,9 +44,9 @@ ExN05EMShowerModel::ExN05EMShowerModel(G4String modelName, G4LogicalVolume* enve
fFakeStep = new G4Step();
fFakePreStepPoint = fFakeStep->GetPreStepPoint();
fFakePostStepPoint = fFakeStep->GetPostStepPoint();
fpTouchable = new G4TouchableHistory();
fpNavigator = new G4Navigator();
fNaviSetup = false;
fTouchableHandle = new G4TouchableHistory();
fpNavigator = new G4Navigator();
fNaviSetup = false;
}
ExN05EMShowerModel::ExN05EMShowerModel(G4String modelName)
@@ -54,15 +55,14 @@ ExN05EMShowerModel::ExN05EMShowerModel(G4String modelName)
fFakeStep = new G4Step();
fFakePreStepPoint = fFakeStep->GetPreStepPoint();
fFakePostStepPoint = fFakeStep->GetPostStepPoint();
fpTouchable = new G4TouchableHistory();
fpNavigator = new G4Navigator();
fNaviSetup = false;
fTouchableHandle = new G4TouchableHistory();
fpNavigator = new G4Navigator();
fNaviSetup = false;
}
ExN05EMShowerModel::~ExN05EMShowerModel()
{
delete fFakeStep;
delete fpTouchable;
delete fpNavigator;
}
@@ -83,6 +83,8 @@ G4bool ExN05EMShowerModel::ModelTrigger(const G4FastTrack& fastTrack)
void ExN05EMShowerModel::DoIt(const G4FastTrack& fastTrack,
G4FastStep& fastStep)
{
G4cout << "ExN05EMShowerModel::DoIt" << G4endl;
// Kill the parawmeterised particle:
fastStep.KillPrimaryTrack();
fastStep.SetPrimaryTrackPathLength(0.0);
@@ -173,7 +175,7 @@ void ExN05EMShowerModel::Explode(const G4FastTrack& fastTrack)
void ExN05EMShowerModel::BuildDetectorResponse()
{
// Does the assignation of the energy spots to the sensitive volumes:
for (int i = 0; i < feSpotList.size(); i++)
for (size_t i = 0; i < feSpotList.size(); i++)
{
// Draw the energy spot:
feSpotList[i].Draw();
@@ -226,7 +228,7 @@ void ExN05EMShowerModel::FillFakeStep(const ExN05EnergySpot &eSpot)
GetNavigatorForTracking()->GetWorldVolume());
fpNavigator->
LocateGlobalPointAndUpdateTouchable(eSpot.GetPosition(),
fpTouchable,
fTouchableHandle(),
false);
fNaviSetup = true;
}
@@ -234,14 +236,14 @@ void ExN05EMShowerModel::FillFakeStep(const ExN05EnergySpot &eSpot)
{
fpNavigator->
LocateGlobalPointAndUpdateTouchable(eSpot.GetPosition(),
fpTouchable);
fTouchableHandle());
}
//--------------------------------------
// Fills attribute of the G4Step needed
// by our sensitive detector:
//-------------------------------------
// set touchable volume at PreStepPoint:
fFakePreStepPoint->SetTouchable(fpTouchable);
fFakePreStepPoint->SetTouchableHandle(fTouchableHandle);
// set total energy deposit:
fFakeStep->SetTotalEnergyDeposit(eSpot.GetEnergy());
}
examples/novice/N05/src/ExN05EnergySpot.cc
+2 -3
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: ExN05EnergySpot.cc,v 1.3.2.1 2001/06/28 19:07:42 gunter Exp $
// GEANT4 tag $Name: $
// $Id: ExN05EnergySpot.cc,v 1.5 2001/11/05 08:24:52 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
#include "ExN05EnergySpot.hh"
@@ -54,7 +54,6 @@ void ExN05EnergySpot::Draw(G4Colour *color)
G4Polyline polyline;
G4Colour colour(1.,.5,.5);
if (color != 0) colour = *color;
G4VisAttributes attribs(colour);
polyline.SetVisAttributes(colour);
G4ThreeVector pp(Point);
// Draw a "home made" marker:
examples/novice/N05/src/ExN05EventAction.cc
+4 -4
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: ExN05EventAction.cc,v 1.5.2.1 2001/06/28 19:07:42 gunter Exp $
// GEANT4 tag $Name: $
// $Id: ExN05EventAction.cc,v 1.7 2001/11/05 08:24:52 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
#include "ExN05EventAction.hh"
@@ -71,8 +71,8 @@ void ExN05EventAction::EndOfEventAction(const G4Event* evt )
G4cout << ">>> Event " << evt->GetEventID() << G4endl;
G4HCofThisEvent * HCE = evt->GetHCofThisEvent();
ExN05CalorimeterHitsCollection* CaloHC = NULL;
ExN05CalorimeterHitsCollection* HadCaloHC = NULL;
ExN05CalorimeterHitsCollection* CaloHC = 0;
ExN05CalorimeterHitsCollection* HadCaloHC = 0;
if(HCE)
{
CaloHC = (ExN05CalorimeterHitsCollection*)(HCE->GetHC(calorimeterCollID));
examples/novice/N05/src/ExN05EventActionMessenger.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: ExN05EventActionMessenger.cc,v 1.2.4.1 2001/06/28 19:07:42 gunter Exp $
// GEANT4 tag $Name: $
// $Id: ExN05EventActionMessenger.cc,v 1.3 2001/07/11 09:58:34 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
#include "ExN05EventActionMessenger.hh"
examples/novice/N05/src/ExN05MaxTimeCuts.cc
+2 -3
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: ExN05MaxTimeCuts.cc,v 1.2.4.2 2001/06/28 20:18:49 gunter Exp $
// GEANT4 tag $Name: $
// $Id: ExN05MaxTimeCuts.cc,v 1.4 2001/11/05 08:24:52 gcosmo Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
//
// --------------------------------------------------------------
@@ -70,7 +70,6 @@ G4double ExN05MaxTimeCuts::PostStepGetPhysicalInteractionLength(
// get the pointer to UserLimits
G4UserLimits* pUserLimits = aTrack.GetVolume()->GetLogicalVolume()->GetUserLimits();
const G4DynamicParticle* aParticle = aTrack.GetDynamicParticle();
G4ParticleDefinition* aParticleDef = aTrack.GetDefinition();
if (pUserLimits) {
G4double temp = DBL_MAX;
examples/novice/N05/src/ExN05MinEkineCuts.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: ExN05MinEkineCuts.cc,v 1.2.4.2 2001/06/28 20:18:49 gunter Exp $
// GEANT4 tag $Name: $
// $Id: ExN05MinEkineCuts.cc,v 1.3 2001/07/11 09:58:35 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
//
// --------------------------------------------------------------
examples/novice/N05/src/ExN05MinRangeCuts.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: ExN05MinRangeCuts.cc,v 1.2.4.2 2001/06/28 20:18:49 gunter Exp $
// GEANT4 tag $Name: $
// $Id: ExN05MinRangeCuts.cc,v 1.3 2001/07/11 09:58:35 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
//
// --------------------------------------------------------------
examples/novice/N05/src/ExN05PhysicsList.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: ExN05PhysicsList.cc,v 1.5.4.1 2001/06/28 19:07:42 gunter Exp $
// GEANT4 tag $Name: $
// $Id: ExN05PhysicsList.cc,v 1.6 2001/07/11 09:58:35 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
//
examples/novice/N05/src/ExN05PiModel.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: ExN05PiModel.cc,v 1.2.4.1 2001/06/28 19:07:42 gunter Exp $
// GEANT4 tag $Name: $
// $Id: ExN05PiModel.cc,v 1.3 2001/07/11 09:58:35 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
#include "ExN05PiModel.hh"
examples/novice/N05/src/ExN05PionShowerModel.cc
+15 -14
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: ExN05PionShowerModel.cc,v 1.4.2.1 2001/06/28 19:07:43 gunter Exp $
// GEANT4 tag $Name: $
// $Id: ExN05PionShowerModel.cc,v 1.7 2001/11/08 10:21:29 radoone Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
#include "ExN05PionShowerModel.hh"
#include "ExN05EnergySpot.hh"
@@ -33,7 +33,7 @@
#include "G4PionPlus.hh"
#include "G4TransportationManager.hh"
#include "G4VSensitiveDetector.hh"
#include "G4VTouchable.hh"
#include "G4TouchableHistory.hh"
#include "G4Colour.hh"
@@ -43,9 +43,9 @@ ExN05PionShowerModel::ExN05PionShowerModel(G4String modelName, G4LogicalVolume*
fFakeStep = new G4Step();
fFakePreStepPoint = fFakeStep->GetPreStepPoint();
fFakePostStepPoint = fFakeStep->GetPostStepPoint();
fpTouchable = new G4TouchableHistory();
fpNavigator = new G4Navigator();
fNaviSetup = false;
fTouchableHandle = new G4TouchableHistory();
fpNavigator = new G4Navigator();
fNaviSetup = false;
}
ExN05PionShowerModel::ExN05PionShowerModel(G4String modelName)
@@ -54,15 +54,14 @@ ExN05PionShowerModel::ExN05PionShowerModel(G4String modelName)
fFakeStep = new G4Step();
fFakePreStepPoint = fFakeStep->GetPreStepPoint();
fFakePostStepPoint = fFakeStep->GetPostStepPoint();
fpTouchable = new G4TouchableHistory();
fpNavigator = new G4Navigator();
fNaviSetup = false;
fTouchableHandle = new G4TouchableHistory();
fpNavigator = new G4Navigator();
fNaviSetup = false;
}
ExN05PionShowerModel::~ExN05PionShowerModel()
{
delete fFakeStep;
delete fpTouchable;
delete fpNavigator;
}
@@ -82,6 +81,8 @@ G4bool ExN05PionShowerModel::ModelTrigger(const G4FastTrack& fastTrack)
void ExN05PionShowerModel::DoIt(const G4FastTrack& fastTrack,
G4FastStep& fastStep)
{
G4cout << "ExN05PionShowerModel::DoIt" << G4endl;
// Kill the parawmeterised particle:
fastStep.KillPrimaryTrack();
fastStep.SetPrimaryTrackPathLength(0.0);
@@ -146,7 +147,7 @@ void ExN05PionShowerModel::Explode(const G4FastTrack& fastTrack)
void ExN05PionShowerModel::BuildDetectorResponse()
{
// Does the assignation of the energy spots to the sensitive volumes:
for (int i = 0; i < feSpotList.size(); i++)
for (size_t i = 0; i < feSpotList.size(); i++)
{
// Draw the energy spot:
G4Colour red(1.,0.,0.);
@@ -200,7 +201,7 @@ void ExN05PionShowerModel::FillFakeStep(const ExN05EnergySpot &eSpot)
GetNavigatorForTracking()->GetWorldVolume());
fpNavigator->
LocateGlobalPointAndUpdateTouchable(eSpot.GetPosition(),
fpTouchable,
fTouchableHandle(),
false);
fNaviSetup = true;
}
@@ -208,14 +209,14 @@ void ExN05PionShowerModel::FillFakeStep(const ExN05EnergySpot &eSpot)
{
fpNavigator->
LocateGlobalPointAndUpdateTouchable(eSpot.GetPosition(),
fpTouchable);
fTouchableHandle());
}
//--------------------------------------
// Fills attribute of the G4Step needed
// by our sensitive detector:
//-------------------------------------
// set touchable volume at PreStepPoint:
fFakePreStepPoint->SetTouchable(fpTouchable);
fFakePreStepPoint->SetTouchableHandle(fTouchableHandle);
// set total energy deposit:
fFakeStep->SetTotalEnergyDeposit(eSpot.GetEnergy());
}
examples/novice/N05/src/ExN05PrimaryGeneratorAction.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: ExN05PrimaryGeneratorAction.cc,v 1.2.4.1 2001/06/28 19:07:43 gunter Exp $
// GEANT4 tag $Name: $
// $Id: ExN05PrimaryGeneratorAction.cc,v 1.3 2001/07/11 09:58:36 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
#include "ExN05PrimaryGeneratorAction.hh"
examples/novice/N05/src/ExN05RunAction.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: ExN05RunAction.cc,v 1.5.4.1 2001/06/28 19:07:43 gunter Exp $
// GEANT4 tag $Name: $
// $Id: ExN05RunAction.cc,v 1.6 2001/07/11 09:58:36 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
// Make this appear first!
examples/novice/N05/src/ExN05SpecialCuts.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: ExN05SpecialCuts.cc,v 1.3.4.2 2001/06/28 20:18:49 gunter Exp $
// GEANT4 tag $Name: $
// $Id: ExN05SpecialCuts.cc,v 1.4 2001/07/11 09:58:36 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
//
// ------------------------------------------------------------
examples/novice/N05/src/ExN05SteppingAction.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: ExN05SteppingAction.cc,v 1.4.2.1 2001/06/28 19:07:43 gunter Exp $
// GEANT4 tag $Name: $
// $Id: ExN05SteppingAction.cc,v 1.5 2001/07/11 09:58:36 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
#include "ExN05SteppingAction.hh"
examples/novice/N05/src/ExN05SteppingActionMessenger.cc
+2 -2
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: ExN05SteppingActionMessenger.cc,v 1.2.4.1 2001/06/28 19:07:43 gunter Exp $
// GEANT4 tag $Name: $
// $Id: ExN05SteppingActionMessenger.cc,v 1.3 2001/07/11 09:58:36 gunter Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
#include "ExN05SteppingActionMessenger.hh"
examples/novice/N05/src/ExN05VisManager.cc
+24 -28
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: ExN05VisManager.cc,v 1.1.4.1 2001/06/28 19:07:43 gunter Exp $
// GEANT4 tag $Name: $
// $Id: ExN05VisManager.cc,v 1.5 2001/11/15 13:09:59 johna Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -34,14 +34,21 @@
// Supported drivers...
// Not needing external packages or libraries...
#include "G4ASCIITree.hh"
#include "G4DAWNFILE.hh"
#include "G4GAGTree.hh"
#include "G4HepRepFile.hh"
#include "G4RayTracer.hh"
#include "G4VRML1File.hh"
#include "G4VRML2File.hh"
// Needing external packages or libraries...
#ifdef G4VIS_USE_DAWN
#include "G4FukuiRenderer.hh"
#endif
#ifdef G4VIS_USE_DAWNFILE
#include "G4DAWNFILE.hh"
#endif
#ifdef G4VIS_USE_OPACS
#include "G4Wo.hh"
#include "G4Xo.hh"
@@ -75,15 +82,6 @@
#include "G4VRML2.hh"
#endif
#ifdef G4VIS_USE_VRMLFILE
#include "G4VRML1File.hh"
#include "G4VRML2File.hh"
#endif
#ifdef G4VIS_USE_RAYTRACER
#include "G4RayTracer.hh"
#endif
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
ExN05VisManager::ExN05VisManager () {}
@@ -92,14 +90,21 @@ ExN05VisManager::ExN05VisManager () {}
void ExN05VisManager::RegisterGraphicsSystems () {
// Graphics Systems not needing external packages or libraries...
RegisterGraphicsSystem (new G4ASCIITree);
RegisterGraphicsSystem (new G4DAWNFILE);
RegisterGraphicsSystem (new G4GAGTree);
RegisterGraphicsSystem (new G4HepRepFile);
RegisterGraphicsSystem (new G4RayTracer);
RegisterGraphicsSystem (new G4VRML1File);
RegisterGraphicsSystem (new G4VRML2File);
// Graphics systems needing external packages or libraries...
#ifdef G4VIS_USE_DAWN
RegisterGraphicsSystem (new G4FukuiRenderer);
#endif
#ifdef G4VIS_USE_DAWNFILE
RegisterGraphicsSystem (new G4DAWNFILE);
#endif
#ifdef G4VIS_USE_OPACS
RegisterGraphicsSystem (new G4Wo);
RegisterGraphicsSystem (new G4Xo);
@@ -133,15 +138,6 @@ void ExN05VisManager::RegisterGraphicsSystems () {
RegisterGraphicsSystem (new G4VRML2);
#endif
#ifdef G4VIS_USE_VRMLFILE
RegisterGraphicsSystem (new G4VRML1File);
RegisterGraphicsSystem (new G4VRML2File);
#endif
#ifdef G4VIS_USE_RAYTRACER
RegisterGraphicsSystem (new G4RayTracer);
#endif
if (fVerbose > 0) {
G4cout <<
"\nYou have successfully chosen to use the following graphics systems."
examples/novice/N05/src/RandomGamma.cc
+1 -1
View File
@@ -46,7 +46,7 @@ double RandomGamma(double p)
}
else
{
int m = p;
int m = int(p);
double f = p - m;
if (m > 0)
{