Import Geant4 9.6.0 source tree
This commit is contained in:
@@ -17,6 +17,21 @@ committal in the CVS repository !
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
October 22nd, 2012 G.Cosmo (geombias-V09-05-03)
|
||||
- Added static flag on deprecation warning...
|
||||
|
||||
October 15th, 2012 G.Cosmo (geombias-V09-05-02)
|
||||
- Moved warning message to cout instead of cerr and formatted text.
|
||||
Corrected compilation error due to missing inclusion of G4ios.hh....
|
||||
|
||||
October 12th, 2012 M.Asai (geombias-V09-05-01)
|
||||
- Added obsolete warning message to G4VCellScorer and G4VCellScorerStore
|
||||
classes, pleanned for removal in release 10.
|
||||
|
||||
May 14th, 2012 G.Cosmo (geombias-V09-05-00)
|
||||
- Fixed spurious cases of hidden variable visibility, detected with
|
||||
'-Wshadow' compilation option on gcc compiler.
|
||||
|
||||
August 11th, 2011 G.Cosmo (geombias-V09-04-01)
|
||||
- Defined scheme for warnings/errors coding:
|
||||
+ 1xxx for warnings, 0xxx for errors.
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4GeometryCell.hh,v 1.7 2010-07-02 09:36:50 gcosmo Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// Class G4GeometryCell
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4GeometryCellComp.hh,v 1.2 2006-06-29 18:15:52 gunter Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// Class G4GeometryCellComp
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4GeometryCellImportance.hh,v 1.4 2006-06-29 18:15:54 gunter Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// Class G4GeometryCellImportance
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4GeometryCellStep.hh,v 1.2 2006-06-29 18:15:57 gunter Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// Class G4GeometryCellStep
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4GeometryCellStepStream.hh,v 1.3 2006-06-29 18:15:59 gunter Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// Declarations
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4GeometryCellWeight.hh,v 1.3 2006-06-29 18:16:02 gunter Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// Class G4GeometryCellWeight
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4IStore.hh,v 1.10 2006-06-29 18:16:04 gunter Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// Class G4IStore
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4ImportanceAlgorithm.hh,v 1.7 2006-06-29 18:16:06 gunter Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// Class G4ImportanceAlgorithm
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4Nsplit_Weight.hh,v 1.11 2006-06-29 18:16:21 gunter Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// Class G4Nsplit_Weight
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4VCellScorer.hh,v 1.7 2006-06-29 18:16:29 gunter Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// Class G4VCellScorer
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4VCellScorerStore.hh,v 1.7 2006-06-29 18:16:32 gunter Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// Class G4VCellScorerStore
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4VGCellFinder.hh,v 1.2 2006-06-29 18:16:34 gunter Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// Class G4VGCellFinder
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4VIStore.hh,v 1.9 2006-06-29 18:16:37 gunter Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// Class G4VIStore
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4VImportanceAlgorithm.hh,v 1.8 2006-06-29 18:16:40 gunter Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// Class G4VImportanceAlgorithm
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4VImportanceSplitExaminer.hh,v 1.5 2006-06-29 18:16:42 gunter Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// Class G4VImportanceSplitExaminer
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4VWeightWindowAlgorithm.hh,v 1.8 2006-06-29 18:16:52 gunter Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// Class G4VWeightWindowAlgorithm
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4VWeightWindowStore.hh,v 1.4 2010-07-02 09:36:50 gcosmo Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// Class G4VWeightWindowStore
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4WeightWindowAlgorithm.hh,v 1.7 2006-06-29 18:16:59 gunter Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// Class G4WeightWindowAlgorithm
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4WeightWindowStore.hh,v 1.4 2010-07-02 09:36:50 gcosmo Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// Class G4WeightWindowStore
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4GeometryCell.cc,v 1.7 2010-07-02 09:36:50 gcosmo Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// GEANT 4 class source file
|
||||
|
||||
@@ -23,8 +23,7 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4GeometryCellComp.cc,v 1.4 2006-06-29 18:17:10 gunter Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// GEANT 4 class source file
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4GeometryCellImportance.cc,v 1.5 2006-06-29 18:17:12 gunter Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// GEANT 4 class source file
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4GeometryCellStep.cc,v 1.2 2006-06-29 18:17:14 gunter Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// GEANT 4 class source file
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4GeometryCellStepStream.cc,v 1.3 2006-06-29 18:17:16 gunter Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// GEANT 4 class source file
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4IStore.cc,v 1.16 2010-09-06 09:13:29 gcosmo Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// GEANT 4 class source file
|
||||
@@ -151,7 +150,7 @@ G4bool G4IStore::IsInWorld(const G4VPhysicalVolume &aVolume) const
|
||||
|
||||
|
||||
|
||||
void G4IStore::Error(const G4String &m) const
|
||||
void G4IStore::Error(const G4String &msg) const
|
||||
{
|
||||
G4Exception("G4IStore::Error()", "GeomBias0002", FatalException, m);
|
||||
G4Exception("G4IStore::Error()", "GeomBias0002", FatalException, msg);
|
||||
}
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4ImportanceAlgorithm.cc,v 1.14 2006-06-29 18:17:20 gunter Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// GEANT 4 class source file
|
||||
@@ -113,14 +112,14 @@ G4ImportanceAlgorithm::Calculate(G4double ipre,
|
||||
return nw;
|
||||
}
|
||||
|
||||
void G4ImportanceAlgorithm::Error(const G4String &m) const
|
||||
void G4ImportanceAlgorithm::Error(const G4String &msg) const
|
||||
{
|
||||
G4Exception("G4ImportanceAlgorithm::Error()",
|
||||
"GeomBias0002", FatalException, m);
|
||||
"GeomBias0002", FatalException, msg);
|
||||
}
|
||||
|
||||
void G4ImportanceAlgorithm::Warning(const G4String &m) const
|
||||
void G4ImportanceAlgorithm::Warning(const G4String &msg) const
|
||||
{
|
||||
G4Exception("G4ImportanceAlgorithm::Warning()",
|
||||
"GeomBias1001", JustWarning, m);
|
||||
"GeomBias1001", JustWarning, msg);
|
||||
}
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4Nsplit_Weight.cc,v 1.10 2006-06-29 18:17:25 gunter Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// GEANT 4 class source file
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4VCellScorer.cc,v 1.6 2006-06-29 18:17:35 gunter Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// GEANT 4 class source file
|
||||
@@ -35,9 +34,24 @@
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
#include "G4VCellScorer.hh"
|
||||
#include "G4ios.hh"
|
||||
|
||||
G4VCellScorer::G4VCellScorer()
|
||||
{}
|
||||
{
|
||||
static G4bool warn=true;
|
||||
if (warn)
|
||||
{
|
||||
G4cout
|
||||
<< "--------------------------------------------------------" << G4endl
|
||||
<< "WARNING: Class <G4VCellScorer> is now obsolete. It |" << G4endl
|
||||
<< " will be removed starting from the next Geant4 |" << G4endl
|
||||
<< " major release. Please, consider switching to |" << G4endl
|
||||
<< " general purpose scoring functionality. |" << G4endl
|
||||
<< "--------------------------------------------------------"
|
||||
<< G4endl;
|
||||
warn = false;
|
||||
}
|
||||
}
|
||||
|
||||
G4VCellScorer::~G4VCellScorer()
|
||||
{}
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4VCellScorerStore.cc,v 1.4 2006-06-29 18:17:37 gunter Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// GEANT 4 class source file
|
||||
@@ -35,9 +34,24 @@
|
||||
// ----------------------------------------------------------------------
|
||||
|
||||
#include "G4VCellScorerStore.hh"
|
||||
#include "G4ios.hh"
|
||||
|
||||
G4VCellScorerStore::G4VCellScorerStore()
|
||||
{}
|
||||
{
|
||||
static G4bool warn=true;
|
||||
if (warn)
|
||||
{
|
||||
G4cout
|
||||
<< "--------------------------------------------------------" << G4endl
|
||||
<< "WARNING: Class <G4VCellScorerStore> is now obsolete |" << G4endl
|
||||
<< " and will be removed starting from next Geant4 |" << G4endl
|
||||
<< " major release. Please, consider switching to |" << G4endl
|
||||
<< " general purpose scoring functionality. |" << G4endl
|
||||
<< "--------------------------------------------------------"
|
||||
<< G4endl;
|
||||
warn = false;
|
||||
}
|
||||
}
|
||||
|
||||
G4VCellScorerStore::~G4VCellScorerStore()
|
||||
{}
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4VGCellFinder.cc,v 1.2 2006-06-29 18:17:39 gunter Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// GEANT 4 class source file
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4VIStore.cc,v 1.2 2006-06-29 18:17:41 gunter Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// GEANT 4 class source file
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4VImportanceAlgorithm.cc,v 1.2 2006-06-29 18:17:43 gunter Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// GEANT 4 class source file
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4VImportanceSplitExaminer.cc,v 1.2 2006-06-29 18:17:45 gunter Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// GEANT 4 class source file
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4VWeightWindowAlgorithm.cc,v 1.2 2006-06-29 18:17:54 gunter Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// GEANT 4 class source file
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4VWeightWindowStore.cc,v 1.3 2006-06-29 18:17:59 gunter Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// GEANT 4 class source file
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4WeightWindowAlgorithm.cc,v 1.11 2007-11-09 15:43:07 ahoward Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// GEANT 4 class source file
|
||||
|
||||
@@ -24,8 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4WeightWindowStore.cc,v 1.7 2010-09-06 09:13:29 gcosmo Exp $
|
||||
// GEANT4 tag $Name: not supported by cvs2svn $
|
||||
// $Id$
|
||||
//
|
||||
// ----------------------------------------------------------------------
|
||||
// GEANT 4 class source file
|
||||
@@ -138,16 +137,16 @@ AddLowerWeights(const G4GeometryCell & gCell,
|
||||
<< ")!";
|
||||
Error(err_mess.str());
|
||||
}
|
||||
G4UpperEnergyToLowerWeightMap m;
|
||||
G4UpperEnergyToLowerWeightMap map;
|
||||
G4int i = 0;
|
||||
for (std::set<G4double, std::less<G4double> >::iterator it =
|
||||
fGeneralUpperEnergyBounds.begin();
|
||||
it != fGeneralUpperEnergyBounds.end();
|
||||
it++) {
|
||||
m[*it] = lowerWeights[i];
|
||||
map[*it] = lowerWeights[i];
|
||||
i++;
|
||||
}
|
||||
fCellToUpEnBoundLoWePairsMap[gCell] = m;
|
||||
fCellToUpEnBoundLoWePairsMap[gCell] = map;
|
||||
}
|
||||
|
||||
|
||||
@@ -177,8 +176,8 @@ SetGeneralUpperEnergyBounds(const std::set<G4double,
|
||||
}
|
||||
|
||||
|
||||
void G4WeightWindowStore::Error(const G4String &m) const
|
||||
void G4WeightWindowStore::Error(const G4String &msg) const
|
||||
{
|
||||
G4Exception("G4WeightWindowStore::Error()",
|
||||
"GeomBias0002", FatalException, m);
|
||||
"GeomBias0002", FatalException, msg);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user