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

Import Geant4 10.3.0.beta source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-30 14:12:05 +02:00
parent a654a7ab1f
commit 4ec577e5c4
2021 changed files with 100995 additions and 78277 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/digits_hits/utils/include/G4ScoringManager.hh
+6 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4ScoringManager.hh 81087 2014-05-20 15:44:27Z gcosmo $
// $Id: G4ScoringManager.hh 94772 2015-12-09 09:46:45Z gcosmo $
//
#ifndef G4ScoringManager_h
@@ -55,7 +55,9 @@ typedef std::vector<G4VScoringMesh*>::const_iterator MeshVecConstItr;
typedef std::map<G4String,G4VScoreColorMap*> ColorMapDict;
typedef std::map<G4String,G4VScoreColorMap*>::iterator ColorMapDictItr;
typedef std::map<G4String,G4VScoreColorMap*>::const_iterator ColorMapDictConstItr;
typedef std::map<G4int,G4VScoringMesh*> MeshMap;
typedef std::map<G4int,G4VScoringMesh*>::iterator MeshMapItr;
typedef std::map<G4int,G4VScoringMesh*>::const_iterator MeshMapConstItr;
class G4ScoringManager
{
@@ -83,6 +85,7 @@ class G4ScoringManager
public:
void Accumulate(G4VHitsCollection* map);
void Merge(const G4ScoringManager* scMan);
G4VScoringMesh* FindMesh(G4VHitsCollection* map);
G4VScoringMesh* FindMesh(const G4String&);
void List() const;
void Dump() const;
@@ -112,6 +115,7 @@ class G4ScoringManager
G4VScoreColorMap * fDefaultLinearColorMap;
ColorMapDict * fColorMapDict;
MeshMap fMeshMap;
public:
inline void SetCurrentMesh(G4VScoringMesh* scm)
{ fCurrentMesh = scm; }
source/digits_hits/utils/include/G4VScoringMesh.hh
+4 -4
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4VScoringMesh.hh 83518 2014-08-27 12:57:10Z gcosmo $
// $Id: G4VScoringMesh.hh 94772 2015-12-09 09:46:45Z gcosmo $
//
#ifndef G4VScoringMesh_h
@@ -135,7 +135,7 @@ class G4VScoringMesh
G4bool FindPrimitiveScorer(const G4String & psname);
// get whether current primitive scorer is set or not
G4bool IsCurrentPrimitiveScorerNull() {
if(fCurrentPS == NULL) return true;
if(fCurrentPS == nullptr) return true;
else return false;
}
// get unit of primitive scorer by the name
@@ -153,7 +153,7 @@ class G4VScoringMesh
void GetDivisionAxisNames(G4String divisionAxisNames[3]);
// set current primitive scorer to NULL
void SetNullToCurrentPrimitiveScorer() {fCurrentPS = NULL;}
void SetNullToCurrentPrimitiveScorer() {fCurrentPS = nullptr;}
// set verbose level
inline void SetVerboseLevel(G4int vl)
{ verboseLevel = vl; }
@@ -213,7 +213,7 @@ public:
inline void GeometryHasBeenDestroyed()
{
fGeometryHasBeenDestroyed = true;
fMeshElementLogical = 0;
fMeshElementLogical = nullptr;
}
};