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
source/analysis/hntools/src/G4BaseHistoUtilities.cc
+1 -1
View File
@@ -69,7 +69,7 @@ G4double GetWidth(const G4ToolsBaseHisto& baseHisto, G4int dimension,
G4ExceptionDescription description;
description << " nbins = 0 (for " << hnType << ").";
G4Exception(functionName, "Analysis_W014", JustWarning, description);
return 0;
return 0.;
}
return ( baseHisto.get_axis(dimension).upper_edge()
source/analysis/hntools/src/G4H1ToolsManager.cc
+3 -3
View File
@@ -374,7 +374,7 @@ G4double G4H1ToolsManager::GetH1Xmin(G4int id) const
// Returns xmin value with applied unit and histogram function
auto h1d = GetTInFunction(id, "GetH1Xmin");
if ( ! h1d ) return 0;
if ( ! h1d ) return 0.;
return GetMin(*h1d, kX);
}
@@ -383,7 +383,7 @@ G4double G4H1ToolsManager::GetH1Xmin(G4int id) const
G4double G4H1ToolsManager::GetH1Xmax(G4int id) const
{
auto h1d = GetTInFunction(id, "GetH1Xmax");
if ( ! h1d ) return 0;
if ( ! h1d ) return 0.;
return GetMax(*h1d, kX);
}
@@ -392,7 +392,7 @@ G4double G4H1ToolsManager::GetH1Xmax(G4int id) const
G4double G4H1ToolsManager::GetH1Width(G4int id) const
{
auto h1d = GetTInFunction(id, "GetH1XWidth", true, false);
if ( ! h1d ) return 0;
if ( ! h1d ) return 0.;
return GetWidth(*h1d, kX, fHnManager->GetHnType());
}
source/analysis/hntools/src/G4H2ToolsManager.cc
+6 -6
View File
@@ -453,7 +453,7 @@ G4double G4H2ToolsManager::GetH2Xmin(G4int id) const
// Returns xmin value with applied unit and histogram function
auto h2d = GetTInFunction(id, "GetH2Xmin");
if ( ! h2d ) return 0;
if ( ! h2d ) return 0.;
return GetMin(*h2d, kX);
}
@@ -462,7 +462,7 @@ G4double G4H2ToolsManager::GetH2Xmin(G4int id) const
G4double G4H2ToolsManager::GetH2Xmax(G4int id) const
{
auto h2d = GetTInFunction(id, "GetH2Xmax");
if ( ! h2d ) return 0;
if ( ! h2d ) return 0.;
return GetMax(*h2d, kX);
}
@@ -471,7 +471,7 @@ G4double G4H2ToolsManager::GetH2Xmax(G4int id) const
G4double G4H2ToolsManager::GetH2XWidth(G4int id) const
{
auto h2d = GetTInFunction(id, "GetH2XWidth", true, false);
if ( ! h2d ) return 0;
if ( ! h2d ) return 0.;
return GetWidth(*h2d, kX, fHnManager->GetHnType());
}
@@ -491,7 +491,7 @@ G4double G4H2ToolsManager::GetH2Ymin(G4int id) const
// Returns xmin value with applied unit and histogram function
auto h2d = GetTInFunction(id, "GetH2Ymin");
if ( ! h2d ) return 0;
if ( ! h2d ) return 0.;
return GetMin(*h2d, kY);
}
@@ -500,7 +500,7 @@ G4double G4H2ToolsManager::GetH2Ymin(G4int id) const
G4double G4H2ToolsManager::GetH2Ymax(G4int id) const
{
auto h2d = GetTInFunction(id, "GetH2Ymax");
if ( ! h2d ) return 0;
if ( ! h2d ) return 0.;
return GetMax(*h2d, kY);
}
@@ -509,7 +509,7 @@ G4double G4H2ToolsManager::GetH2Ymax(G4int id) const
G4double G4H2ToolsManager::GetH2YWidth(G4int id) const
{
auto h2d = GetTInFunction(id, "GetH2YWidth", true, false);
if ( ! h2d ) return 0;
if ( ! h2d ) return 0.;
return GetWidth(*h2d, kY, fHnManager->GetHnType());
}
source/analysis/hntools/src/G4H3ToolsManager.cc
+9 -9
View File
@@ -534,7 +534,7 @@ G4double G4H3ToolsManager::GetH3Xmin(G4int id) const
// Returns xmin value with applied unit and histogram function
auto h3d = GetTInFunction(id, "GetH3Xmin");
if ( ! h3d ) return 0;
if ( ! h3d ) return 0.;
return GetMin(*h3d, kX);
}
@@ -543,7 +543,7 @@ G4double G4H3ToolsManager::GetH3Xmin(G4int id) const
G4double G4H3ToolsManager::GetH3Xmax(G4int id) const
{
auto h3d = GetTInFunction(id, "GetH3Xmax");
if ( ! h3d ) return 0;
if ( ! h3d ) return 0.;
return GetMax(*h3d, kX);
}
@@ -552,7 +552,7 @@ G4double G4H3ToolsManager::GetH3Xmax(G4int id) const
G4double G4H3ToolsManager::GetH3XWidth(G4int id) const
{
auto h3d = GetTInFunction(id, "GetH3XWidth", true, false);
if ( ! h3d ) return 0;
if ( ! h3d ) return 0.;
return GetWidth(*h3d, kX, fHnManager->GetHnType());
}
@@ -572,7 +572,7 @@ G4double G4H3ToolsManager::GetH3Ymin(G4int id) const
// Returns xmin value with applied unit and histogram function
auto h3d = GetTInFunction(id, "GetH3Ymin");
if ( ! h3d ) return 0;
if ( ! h3d ) return 0.;
return GetMin(*h3d, kY);
}
@@ -581,7 +581,7 @@ G4double G4H3ToolsManager::GetH3Ymin(G4int id) const
G4double G4H3ToolsManager::GetH3Ymax(G4int id) const
{
auto h3d = GetTInFunction(id, "GetH3Ymax");
if ( ! h3d ) return 0;
if ( ! h3d ) return 0.;
return GetMax(*h3d, kY);
}
@@ -590,7 +590,7 @@ G4double G4H3ToolsManager::GetH3Ymax(G4int id) const
G4double G4H3ToolsManager::GetH3YWidth(G4int id) const
{
auto h3d = GetTInFunction(id, "GetH3YWidth", true, false);
if ( ! h3d ) return 0;
if ( ! h3d ) return 0.;
return GetWidth(*h3d, kY, fHnManager->GetHnType());
}
@@ -610,7 +610,7 @@ G4double G4H3ToolsManager::GetH3Zmin(G4int id) const
// Returns xmin value with applied unit and histogram function
auto h3d = GetTInFunction(id, "GetH3Zmin");
if ( ! h3d ) return 0;
if ( ! h3d ) return 0.;
return GetMin(*h3d, kZ);
}
@@ -619,7 +619,7 @@ G4double G4H3ToolsManager::GetH3Zmin(G4int id) const
G4double G4H3ToolsManager::GetH3Zmax(G4int id) const
{
auto h3d = GetTInFunction(id, "GetH3Zmax");
if ( ! h3d ) return 0;
if ( ! h3d ) return 0.;
return GetMax(*h3d, kZ);
}
@@ -628,7 +628,7 @@ G4double G4H3ToolsManager::GetH3Zmax(G4int id) const
G4double G4H3ToolsManager::GetH3ZWidth(G4int id) const
{
auto h3d = GetTInFunction(id, "GetH3ZWidth", true, false);
if ( ! h3d ) return 0;
if ( ! h3d ) return 0.;
return GetWidth(*h3d, kZ, fHnManager->GetHnType());
}
source/analysis/hntools/src/G4P1ToolsManager.cc
+36 -14
View File
@@ -114,16 +114,25 @@ tools::histo::p1d* CreateToolsP1(const G4String& title,
<< " Linear binning will be applied with given (nbins, xmin, xmax) values";
G4Exception("G4P1ToolsManager::CreateP1",
"Analysis_W013", JustWarning, description);
}
return new tools::histo::p1d(title,
}
if ( ymin == 0. && ymax == 0.) {
return new tools::histo::p1d(title,
nbins, xfcn(xmin/xunit), xfcn(xmax/xunit));
} else {
return new tools::histo::p1d(title,
nbins, xfcn(xmin/xunit), xfcn(xmax/xunit),
yfcn(ymin/yunit), yfcn(ymax/yunit));
}
}
else {
// Compute edges
std::vector<G4double> edges;
ComputeEdges(nbins, xmin, xmax, xunit, xfcn, xbinScheme, edges);
return new tools::histo::p1d(title, edges, yfcn(ymin/yunit), yfcn(ymax/yunit));
if ( ymin == 0. && ymax == 0.) {
return new tools::histo::p1d(title, edges);
} else {
return new tools::histo::p1d(title, edges, yfcn(ymin/yunit), yfcn(ymax/yunit));
}
}
}
@@ -174,15 +183,23 @@ void ConfigureToolsP1(tools::histo::p1d* p1d,
<< " Linear binning will be applied with given (nbins, xmin, xmax) values";
G4Exception("G4P1ToolsManager::SetP1",
"Analysis_W013", JustWarning, description);
}
p1d->configure(nbins, xfcn(xmin/xunit), xfcn(xmax/xunit),
yfcn(ymin/yunit), yfcn(ymax/yunit));
}
if ( ymin == 0. && ymax == 0. ) {
p1d->configure(nbins, xfcn(xmin/xunit), xfcn(xmax/xunit));
} else {
p1d->configure(nbins, xfcn(xmin/xunit), xfcn(xmax/xunit),
yfcn(ymin/yunit), yfcn(ymax/yunit));
}
}
else {
// Compute bins
std::vector<G4double> edges;
ComputeEdges(nbins, xmin, xmax, xunit, xfcn, xbinScheme, edges);
p1d->configure(edges, yfcn(ymin/yunit), yfcn(ymax/yunit));
if ( ymin == 0. && ymax == 0. ) {
p1d->configure(edges);
} else {
p1d->configure(edges, yfcn(ymin/yunit), yfcn(ymax/yunit));
}
}
}
@@ -203,8 +220,13 @@ void ConfigureToolsP1(tools::histo::p1d* p1d,
std::vector<G4double> newEdges;
ComputeEdges(edges, xunit, xfcn, newEdges);
p1d->configure(newEdges, yfcn(ymin/yunit), yfcn(ymax/yunit));
if ( ymin == 0. && ymax == 0. ) {
p1d->configure(newEdges);
} else {
p1d->configure(newEdges, yfcn(ymin/yunit), yfcn(ymax/yunit));
}
}
}
//
@@ -223,7 +245,7 @@ void G4P1ToolsManager::AddP1Information(const G4String& name,
hnInformation->AddDimension(xunitName, xfcnName, xbinScheme);
hnInformation->AddDimension(yunitName, yfcnName, G4BinScheme::kLinear);
}
//
// protected methods
//
@@ -430,7 +452,7 @@ G4double G4P1ToolsManager::GetP1Xmin(G4int id) const
// Returns xmin value with applied unit and profile function
auto p1d = GetTInFunction(id, "GetP1Xmin");
if ( ! p1d ) return 0;
if ( ! p1d ) return 0.;
return GetMin(*p1d, kX);
}
@@ -439,7 +461,7 @@ G4double G4P1ToolsManager::GetP1Xmin(G4int id) const
G4double G4P1ToolsManager::GetP1Xmax(G4int id) const
{
auto p1d = GetTInFunction(id, "GetP1Xmax");
if ( ! p1d ) return 0;
if ( ! p1d ) return 0.;
return GetMax(*p1d, kX);
}
@@ -448,7 +470,7 @@ G4double G4P1ToolsManager::GetP1Xmax(G4int id) const
G4double G4P1ToolsManager::GetP1XWidth(G4int id) const
{
auto p1d = GetTInFunction(id, "GetP1XWidth", true, false);
if ( ! p1d ) return 0;
if ( ! p1d ) return 0.;
return GetWidth(*p1d, kX, fHnManager->GetHnType());
}
@@ -459,7 +481,7 @@ G4double G4P1ToolsManager::GetP1Ymin(G4int id) const
// Returns xmin value with applied unit and profile function
auto p1d = GetTInFunction(id, "GetP1Ymin");
if ( ! p1d ) return 0;
if ( ! p1d ) return 0.;
return p1d->min_v();
}
@@ -468,7 +490,7 @@ G4double G4P1ToolsManager::GetP1Ymin(G4int id) const
G4double G4P1ToolsManager::GetP1Ymax(G4int id) const
{
auto p1d = GetTInFunction(id, "GetP1Ymax");
if ( ! p1d ) return 0;
if ( ! p1d ) return 0.;
return p1d->max_v();
}
source/analysis/hntools/src/G4P2ToolsManager.cc
+51 -20
View File
@@ -128,12 +128,20 @@ tools::histo::p2d* CreateToolsP2(
G4Exception("G4P2ToolsManager::CreateP2",
"Analysis_W013", JustWarning, description);
}
return new tools::histo::p2d(title,
nxbins, xfcn(xmin/xunit), xfcn(xmax/xunit),
nybins, yfcn(ymin/yunit), yfcn(ymax/yunit),
zfcn(zmin/zunit), zfcn(zmax/zunit));
if ( zmin == 0. && zmax == 0.) {
return new tools::histo::p2d(title,
nxbins, xfcn(xmin/xunit), xfcn(xmax/xunit),
nybins, yfcn(ymin/yunit), yfcn(ymax/yunit));
// p2 objects are deleted in destructor and reset when
// closing a file.
} else {
return new tools::histo::p2d(title,
nxbins, xfcn(xmin/xunit), xfcn(xmax/xunit),
nybins, yfcn(ymin/yunit), yfcn(ymax/yunit),
zfcn(zmin/zunit), zfcn(zmax/zunit));
// p2 objects are deleted in destructor and reset when
// closing a file.
}
}
else {
// Compute edges
@@ -141,8 +149,12 @@ tools::histo::p2d* CreateToolsP2(
ComputeEdges(nxbins, xmin, xmax, xunit, xfcn, xbinScheme, xedges);
std::vector<G4double> yedges;
ComputeEdges(nybins, ymin, ymax, yunit, yfcn, ybinScheme, yedges);
return new tools::histo::p2d(title, xedges, yedges,
zfcn(zmin/zunit), zfcn(zmax/zunit));
if ( zmin == 0. && zmax == 0.) {
return new tools::histo::p2d(title, xedges, yedges);
} else {
return new tools::histo::p2d(title, xedges, yedges,
zfcn(zmin/zunit), zfcn(zmax/zunit));
}
}
}
@@ -172,10 +184,16 @@ tools::histo::p2d* CreateToolsP2(
std::vector<G4double> ynewEdges;
ComputeEdges(yedges, yunit, yfcn, ynewEdges);
return new tools::histo::p2d(title, xnewEdges, ynewEdges,
if ( zmin == 0. && zmax == 0.) {
return new tools::histo::p2d(title, xnewEdges, ynewEdges);
// p2 objects are deleted in destructor and reset when
// closing a file.
} else {
return new tools::histo::p2d(title, xnewEdges, ynewEdges,
zfcn(zmin/zunit), zfcn(zmax/zunit));
// p2 objects are deleted in destructor and reset when
// closing a file.
}
}
//_____________________________________________________________________________
@@ -212,9 +230,14 @@ void ConfigureToolsP2(tools::histo::p2d* p2d,
G4Exception("G4P2ToolsManager::CreateP2",
"Analysis_W013", JustWarning, description);
}
p2d->configure(nxbins, xfcn(xmin/xunit), xfcn(xmax/xunit),
nybins, yfcn(ymin/yunit), yfcn(ymax/yunit),
zfcn(zmin/zunit), zfcn(zmax/zunit));
if ( zmin == 0. && zmax == 0. ) {
p2d->configure(nxbins, xfcn(xmin/xunit), xfcn(xmax/xunit),
nybins, yfcn(ymin/yunit), yfcn(ymax/yunit));
} else {
p2d->configure(nxbins, xfcn(xmin/xunit), xfcn(xmax/xunit),
nybins, yfcn(ymin/yunit), yfcn(ymax/yunit),
zfcn(zmin/zunit), zfcn(zmax/zunit));
}
}
else {
// Compute bins
@@ -222,7 +245,11 @@ void ConfigureToolsP2(tools::histo::p2d* p2d,
ComputeEdges(nxbins, xmin, xmax, xunit, xfcn, xbinScheme, xedges);
std::vector<G4double> yedges;
ComputeEdges(nybins, ymin, ymax, yunit, yfcn, ybinScheme, yedges);
p2d->configure(xedges, yedges, zfcn(zmin/zunit), zfcn(zmax/zunit));
if ( zmin == 0. && zmax == 0. ) {
p2d->configure(xedges, yedges);
} else {
p2d->configure(xedges, yedges, zfcn(zmin/zunit), zfcn(zmax/zunit));
}
}
}
@@ -251,7 +278,11 @@ void ConfigureToolsP2(tools::histo::p2d* p2d,
auto zunit = GetUnitValue(zunitName);
auto zfcn = GetFunction(zfcnName);
p2d->configure(xnewEdges, ynewEdges, zfcn(zmin/zunit), zfcn(zmax/zunit));
if ( zmin == 0. && zmax == 0. ) {
p2d->configure(xnewEdges, ynewEdges);
} else {
p2d->configure(xnewEdges, ynewEdges, zfcn(zmin/zunit), zfcn(zmax/zunit));
}
}
}
@@ -520,7 +551,7 @@ G4double G4P2ToolsManager::GetP2Xmin(G4int id) const
// Returns xmin value with applied unit and profile function
auto p2d = GetTInFunction(id, "GetP2Xmin");
if ( ! p2d ) return 0;
if ( ! p2d ) return 0.;
return GetMin(*p2d, kX);
}
@@ -529,7 +560,7 @@ G4double G4P2ToolsManager::GetP2Xmin(G4int id) const
G4double G4P2ToolsManager::GetP2Xmax(G4int id) const
{
auto p2d = GetTInFunction(id, "GetP2Xmax");
if ( ! p2d ) return 0;
if ( ! p2d ) return 0.;
return GetMax(*p2d, kX);
}
@@ -538,7 +569,7 @@ G4double G4P2ToolsManager::GetP2Xmax(G4int id) const
G4double G4P2ToolsManager::GetP2XWidth(G4int id) const
{
auto p2d = GetTInFunction(id, "GetP2XWidth", true, false);
if ( ! p2d ) return 0;
if ( ! p2d ) return 0.;
return GetWidth(*p2d, kX, fHnManager->GetHnType());
}
@@ -558,7 +589,7 @@ G4double G4P2ToolsManager::GetP2Ymin(G4int id) const
// Returns xmin value with applied unit and profile function
auto p2d = GetTInFunction(id, "GetP2Ymin");
if ( ! p2d ) return 0;
if ( ! p2d ) return 0.;
return GetMin(*p2d, kY);
}
@@ -567,7 +598,7 @@ G4double G4P2ToolsManager::GetP2Ymin(G4int id) const
G4double G4P2ToolsManager::GetP2Ymax(G4int id) const
{
auto p2d = GetTInFunction(id, "GetP2Ymax");
if ( ! p2d ) return 0;
if ( ! p2d ) return 0.;
return GetMax(*p2d, kY);
}
@@ -576,7 +607,7 @@ G4double G4P2ToolsManager::GetP2Ymax(G4int id) const
G4double G4P2ToolsManager::GetP2YWidth(G4int id) const
{
auto p2d = GetTInFunction(id, "GetP2YWidth", true, false);
if ( ! p2d ) return 0;
if ( ! p2d ) return 0.;
return GetWidth(*p2d, kY, fHnManager->GetHnType());
}
@@ -587,7 +618,7 @@ G4double G4P2ToolsManager::GetP2Zmin(G4int id) const
// Returns xmin value with applied unit and profile function
auto p2d = GetTInFunction(id, "GetP2Zmin");
if ( ! p2d ) return 0;
if ( ! p2d ) return 0.;
return GetMin(*p2d, kZ);
}
@@ -596,7 +627,7 @@ G4double G4P2ToolsManager::GetP2Zmin(G4int id) const
G4double G4P2ToolsManager::GetP2Zmax(G4int id) const
{
auto p2d = GetTInFunction(id, "GetP2Zmax");
if ( ! p2d ) return 0;
if ( ! p2d ) return 0.;
return GetMax(*p2d, kZ);
}