Import Geant4 10.3.0 source tree
This commit is contained in:
@@ -27,7 +27,7 @@
|
||||
/// \brief Implementation of the F01DetectorConstruction class
|
||||
//
|
||||
//
|
||||
// $Id: F01DetectorConstruction.cc 77881 2013-11-29 08:37:53Z gcosmo $
|
||||
// $Id: F01DetectorConstruction.cc 101664 2016-11-21 09:10:32Z gcosmo $
|
||||
//
|
||||
//
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
@@ -43,6 +43,7 @@
|
||||
#include "G4PhysicalVolumeStore.hh"
|
||||
#include "G4LogicalVolumeStore.hh"
|
||||
#include "G4SolidStore.hh"
|
||||
#include "G4SDManager.hh"
|
||||
|
||||
#include "G4Material.hh"
|
||||
#include "G4Tubs.hh"
|
||||
@@ -388,6 +389,7 @@ void F01DetectorConstruction::ConstructSDandField()
|
||||
F01CalorimeterSD* calorimeterSD = new F01CalorimeterSD("CalorSD",this);
|
||||
fCalorimeterSD.Put(calorimeterSD);
|
||||
}
|
||||
G4SDManager::GetSDMpointer()->AddNewDetector(fCalorimeterSD.Get());
|
||||
SetSensitiveDetector(fLogicAbsorber, fCalorimeterSD.Get());
|
||||
|
||||
// Construct the field creator - this will register the field it creates
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
/// \brief Implementation of the F01FieldSetup class
|
||||
//
|
||||
//
|
||||
// $Id: F01FieldSetup.cc 90341 2015-05-26 08:38:36Z gcosmo $
|
||||
// $Id: F01FieldSetup.cc 100688 2016-10-31 11:21:51Z gcosmo $
|
||||
//
|
||||
// User Field setup class implementation.
|
||||
//
|
||||
@@ -61,6 +61,11 @@
|
||||
#include "G4HelixMixedStepper.hh"
|
||||
#include "G4ExactHelixStepper.hh"
|
||||
|
||||
// Newest steppers - from Release 10.3-beta (June 2013)
|
||||
#include "G4BogackiShampine23.hh"
|
||||
#include "G4BogackiShampine45.hh"
|
||||
#include "G4DormandPrince745.hh"
|
||||
|
||||
#include "G4PhysicalConstants.hh"
|
||||
#include "G4SystemOfUnits.hh"
|
||||
|
||||
@@ -214,10 +219,27 @@ void F01FieldSetup::SetStepper()
|
||||
fStepper = new G4NystromRK4( fEquation );
|
||||
G4cout<<" G4NystromRK4 Stepper is chosen"<<G4endl;
|
||||
break;
|
||||
default: // fStepper = 4;
|
||||
case 14:
|
||||
case 23:
|
||||
fStepper = new G4BogackiShampine23( fEquation );
|
||||
G4cout<<"G4BogackiShampine23 Stepper is chosen"<<G4endl;
|
||||
break;
|
||||
case 15:
|
||||
case 45:
|
||||
fStepper = new G4BogackiShampine45( fEquation );
|
||||
G4cout<<"G4BogackiShampine45 Stepper is chosen"<<G4endl;
|
||||
break;
|
||||
case 457:
|
||||
case 745:
|
||||
fStepper = new G4DormandPrince745( fEquation );
|
||||
G4cout<<"G4DormandPrince745 Stepper is chosen"<<G4endl;
|
||||
break;
|
||||
default:
|
||||
fStepper = new G4ClassicalRK4( fEquation );
|
||||
G4cout<<"G4ClassicalRK4 Stepper (default) is chosen"<<G4endl;
|
||||
break;
|
||||
// fStepper = new G4DormandPrince745( fEquation );
|
||||
// G4cout<<"G4DormandPrince745 (default) Stepper is chosen"<<G4endl;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user