Import Geant4 10.0.0 source tree
This commit is contained in:
@@ -39,12 +39,12 @@
|
||||
#include <fstream>
|
||||
#include "G4VDataSetAlgorithm.hh"
|
||||
|
||||
XrayFluoDataSet::XrayFluoDataSet(G4int Z,
|
||||
XrayFluoDataSet::XrayFluoDataSet(G4int /*Z*/,
|
||||
G4DataVector* points,
|
||||
G4DataVector* values,
|
||||
const G4VDataSetAlgorithm* interpolation,
|
||||
G4double unitE, G4double unitData)
|
||||
:z(Z), energies(points), data(values), algorithm(interpolation)
|
||||
:energies(points), data(values), algorithm(interpolation)
|
||||
{
|
||||
numberOfBins = energies->size();
|
||||
unit1 = unitE;
|
||||
@@ -53,11 +53,11 @@ XrayFluoDataSet::XrayFluoDataSet(G4int Z,
|
||||
G4cout << "XrayFluo FluoDataSet created" << G4endl;
|
||||
}
|
||||
|
||||
XrayFluoDataSet:: XrayFluoDataSet(G4int Z,
|
||||
XrayFluoDataSet:: XrayFluoDataSet(G4int /*Z*/,
|
||||
const G4String& dataFile,
|
||||
const G4VDataSetAlgorithm* interpolation,
|
||||
G4double unitE, G4double unitData)
|
||||
:z(Z), algorithm(interpolation)
|
||||
: algorithm(interpolation)
|
||||
{
|
||||
energies = new G4DataVector;
|
||||
data = new G4DataVector;
|
||||
|
||||
@@ -244,7 +244,7 @@ void XrayFluoDetectorConstruction::SetOhmicPosThickness(G4double val)
|
||||
|
||||
}
|
||||
else{
|
||||
G4cout << "Not available in this configuration" << G4cout;
|
||||
G4cout << "Not available in this configuration" << G4endl;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -628,7 +628,7 @@ void XrayFluoPlaneDetectorConstruction::SetPlaneMaterial(G4String newMaterial)
|
||||
{
|
||||
|
||||
|
||||
G4cout << "Material!!!!" << newMaterial << G4cout;
|
||||
G4cout << "Material!!!!" << newMaterial << G4endl;
|
||||
logicPlane->SetMaterial(materials->GetMaterial(newMaterial));
|
||||
PrintApparateParameters();
|
||||
|
||||
|
||||
@@ -88,7 +88,7 @@ void XrayFluoSimulation::RunSimulation(int argc,char* argv[])
|
||||
|
||||
// chosing Geometry setup
|
||||
|
||||
G4int geometryNumber;
|
||||
G4int geometryNumber = 0;
|
||||
|
||||
if (argc == 3){
|
||||
geometryNumber = atoi(argv[2]);
|
||||
|
||||
Reference in New Issue
Block a user