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

Import Geant4 10.0.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-10 11:51:14 +02:00
parent e2d2f9810a
commit 286caacf06
12421 changed files with 730077 additions and 502383 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/digits_hits/CMakeLists.txt
+1 -1
View File
@@ -8,7 +8,7 @@
#
# Generated on : 24/9/2010
#
# $Id: CMakeLists.txt,v 1.1 2010-09-29 18:37:44 bmorgan Exp $
# $Id: CMakeLists.txt 66892 2013-01-17 10:57:59Z gunter $
#
#------------------------------------------------------------------------------
source/digits_hits/GNUmakefile
+1 -1
View File
@@ -1,4 +1,4 @@
# $Id: GNUmakefile,v 1.6 2007-12-11 13:26:13 gcosmo Exp $
# $Id: GNUmakefile 66892 2013-01-17 10:57:59Z gunter $
# --------------------------------------------------------------
# GNUmakefile for digits+hits library. Makoto Asai, 1/11/96.
# --------------------------------------------------------------
source/digits_hits/History
+44 -1
View File
@@ -1,4 +1,4 @@
$Id: History,v 1.50 2010-11-10 16:38:39 gcosmo Exp $
$Id: History 78057 2013-12-03 08:31:15Z gcosmo $
-------------------------------------------------------------------
=========================================================
@@ -17,6 +17,49 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
Dec 2, 2013, M.Asai (digits_hits-V09-06-13)
- Remove uninitialized and unused datamember from G4ScoringMessenger.
Nov 29, 2013, M.Asai (digits_hits-V09-06-12)
- Remove self-deletion in G4ScoringManager::~G4Scoringmanager().
Nov 7, 2013, G.Cosmo (digits_hits-V09-06-11)
- Replaced deprecated calls to G4Sphere accessor methods in scorer classes.
Oct 14, 2013, M. Asai (digits_hits-V09-06-10)
- Fix the logic in G4SDStructure for issuing G4Exception for the same detector name.
Sep 20, 2013, M. Asai (digits_hits-V09-06-09)
- Fix G4SDStructure::RemoveSD() method.
Sep 19, 2013, M. Asai (digits_hits-V09-06-08)
- G4VReadOutGeometry now issues a G4Exception warning message if it is used.
Sep 14, 2013, M. Asai (digits_hits-V09-06-07)
- The pointer is now overwritten if a detector of same name is registered to G4SDManager.
Sep 11, 2013, M. Asai (digits_hits-V09-06-06)
- Remove unnecessary G4Exception.
Mar 29, 2013, T. Aso (digits_hits-V09-06-05)
- Adding missing options in command-based scorers in G4ScoreQuantityMessenger and
G4ScoreQuantityMessengerQCmd.
Mar 22, 2013, M. Asai (digits_hits-V09-06-04)
- Adding Merge() for scoring meshes to be used in multi-threaded mode to reduce the score after the run.
Mar 12, 2013, M. Asai (digits_hits-V09-06-03)
- Changing method names in G4VScoringMesh and its derived classes.
Mar 12, 2013, M. Asai (digits_hits-V09-06-02)
- Adding Merge() methods to G4ScoringManager and G4VScoringMesh (needed for multi-threaded)
Mar 4, 2013, A. Dotti (digits_hits-V09-06-01)
- Fixing unused variables warnings
Feb 26, 2013, A.Dotti (digits_hits-V09-06-00)
- Adding of protoype cloning mechansim for SD (needed for multi-threaded)
Jun 14, 2012, G.Cosmo (digits_hits-V09-05-05)
- Explicitly use inclusion of headers for system of units and physical
constants, in plan to remove implicit inclusion from globals.hh.
source/digits_hits/detector/CMakeLists.txt
+1 -1
View File
@@ -7,7 +7,7 @@
#
# Generated on : 24/9/2010
#
# $Id: CMakeLists.txt,v 1.1 2010-09-29 18:37:57 bmorgan Exp $
# $Id: CMakeLists.txt 66892 2013-01-17 10:57:59Z gunter $
#
#------------------------------------------------------------------------------
source/digits_hits/detector/GNUmakefile
+1 -1
View File
@@ -1,4 +1,4 @@
# $Id: GNUmakefile,v 1.5 2010-10-27 08:10:13 gcosmo Exp $
# $Id: GNUmakefile 66892 2013-01-17 10:57:59Z gunter $
# --------------------------------------------------------------
# GNUmakefile for digits+hits library. Makoto Asai, 1/11/96.
# --------------------------------------------------------------
source/digits_hits/detector/History
+3 -1
View File
@@ -1,4 +1,4 @@
$Id: History,v 1.6 2007-06-04 13:17:18 ahoward Exp $
$Id: History 67992 2013-03-13 10:59:57Z gcosmo $
-------------------------------------------------------------------
=========================================================
@@ -16,6 +16,8 @@ committal in the CVS repository !
----------------------------------------------------------
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
Febr 26, 2013 Andrea Dotti
- Adding cloning capbailities to SD
June 4, 2007, A.Howard
- Put back some classes required for scoring of geometrical biasing cells:
source/digits_hits/detector/include/G4CellScoreComposer.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4CellScoreComposer.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
// ----------------------------------------------------------------------
// Class G4CellScoreComposer
source/digits_hits/detector/include/G4CellScoreValues.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4CellScoreValues.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
// ----------------------------------------------------------------------
// Class G4CellScoreValues
source/digits_hits/detector/include/G4CollectionNameVector.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4CollectionNameVector.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
#ifndef G4CollectionNameVector_H
source/digits_hits/detector/include/G4HCtable.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4HCtable.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
#ifndef G4HCtable_H
source/digits_hits/detector/include/G4MultiFunctionalDetector.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4MultiFunctionalDetector.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
#ifndef G4MultiFunctionalDetector_h
source/digits_hits/detector/include/G4SDManager.hh
+2 -2
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4SDManager.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
#ifndef G4SDManager_h
@@ -80,7 +80,7 @@ class G4SDManager
private:
static G4SDManager * fSDManager;
static G4ThreadLocal G4SDManager * fSDManager;
G4SDStructure * treeTop;
G4int verboseLevel;
G4HCtable* HCtable;
source/digits_hits/detector/include/G4SDStructure.hh
+2 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4SDStructure.hh 74048 2013-09-20 09:34:57Z gcosmo $
//
#ifndef G4SDStructure_h
@@ -63,6 +63,7 @@ class G4SDStructure
private:
G4SDStructure* FindSubDirectory(G4String subD);
G4String ExtractDirName(G4String aPath);
void RemoveSD(G4VSensitiveDetector*);
private:
std::vector<G4SDStructure*> structure;
source/digits_hits/detector/include/G4SDmessenger.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4SDmessenger.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
#ifndef G4SDmessenger_h
source/digits_hits/detector/include/G4SensitiveVolumeList.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4SensitiveVolumeList.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
// ------------------------------------------------------------
// GEANT 4 class header file --- Copyright CERN 1996
source/digits_hits/detector/include/G4SensitiveVolumeList.icc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4SensitiveVolumeList.icc 67992 2013-03-13 10:59:57Z gcosmo $
//
// -----------------------------------------------------------
// Inline functions of GEANT 4 class header file.
source/digits_hits/detector/include/G4TrackLogger.hh
+1 -1
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id$
// $Id: G4TrackLogger.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
// ----------------------------------------------------------------------
// Class G4TrackLogger
source/digits_hits/detector/include/G4VPrimitiveScorer.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4VPrimitiveScorer.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
#ifndef G4VPrimitiveScorer_h
source/digits_hits/detector/include/G4VReadOutGeometry.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4VReadOutGeometry.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
// ------------------------------------------------------------
source/digits_hits/detector/include/G4VSDFilter.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4VSDFilter.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
#ifndef G4VSDFilter_h
source/digits_hits/detector/include/G4VSensitiveDetector.hh
+3 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4VSensitiveDetector.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
#ifndef G4VSensitiveDetector_h
@@ -153,6 +153,8 @@ class G4VSensitiveDetector
{ return ROgeometry; }
inline G4VSDFilter* GetFilter() const
{ return filter; }
public:
virtual G4VSensitiveDetector* Clone() const;
};
source/digits_hits/detector/sources.cmake
+1 -1
View File
@@ -11,7 +11,7 @@
#
# Generated on : 24/9/2010
#
# $Id: sources.cmake,v 1.1 2010-09-29 18:38:06 bmorgan Exp $
# $Id: sources.cmake 66892 2013-01-17 10:57:59Z gunter $
#
#------------------------------------------------------------------------------
source/digits_hits/detector/src/G4CellScoreComposer.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4CellScoreComposer.cc 67992 2013-03-13 10:59:57Z gcosmo $
//
// ----------------------------------------------------------------------
// GEANT 4 class source file
source/digits_hits/detector/src/G4HCtable.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4HCtable.cc 67992 2013-03-13 10:59:57Z gcosmo $
//
#include "G4HCtable.hh"
source/digits_hits/detector/src/G4MultiFunctionalDetector.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4MultiFunctionalDetector.cc 67992 2013-03-13 10:59:57Z gcosmo $
//
// G4MultiFunctionalDetector
//
source/digits_hits/detector/src/G4SDManager.cc
+4 -6
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4SDManager.cc 73819 2013-09-12 15:52:52Z gcosmo $
//
#include "G4SDManager.hh"
@@ -35,7 +35,7 @@
#include "G4ios.hh"
G4SDManager* G4SDManager::fSDManager = 0;
G4ThreadLocal G4SDManager* G4SDManager::fSDManager = 0;
G4SDManager* G4SDManager::GetSDMpointer()
{
@@ -91,10 +91,8 @@ void G4SDManager::AddNewCollection(G4String SDname,G4String DCname)
if(verboseLevel>0)
{
if(i<0) {
G4ExceptionDescription ED;
ED << "G4SDManager::AddNewCollection : the collection <"
<< SDname << "/" << DCname << "> has already been reginstered." << G4endl;
G4Exception("G4SDManager::AddNewCollection","Det0001",JustWarning,ED);
if(verboseLevel>1) G4cout << "G4SDManager::AddNewCollection : the collection <"
<< SDname << "/" << DCname << "> has already been reginstered." << G4endl;
}
else
{
source/digits_hits/detector/src/G4SDStructure.cc
+24 -7
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4SDStructure.cc 74576 2013-10-15 07:20:11Z gcosmo $
//
// G4SDStructure
@@ -81,13 +81,18 @@ void G4SDStructure::AddNewDetector(G4VSensitiveDetector*aSD,
else
{ // The sensitive detector should be kept in this directory.
G4VSensitiveDetector* tgtSD = GetSD( aSD->GetName() );
if( tgtSD != 0 )
{
G4cout << aSD->GetName() << " had already stored in "
<< pathName << G4endl;
}
else
if(!tgtSD)
{ detector.push_back( aSD ); }
else if( tgtSD != aSD )
{
#ifdef G4VERBOSE
G4ExceptionDescription ed;
ed << aSD->GetName() << " had already been stored in "
<< pathName << ". Object pointer is overwitten.\n";
ed << "It's users' responsibility to delete the old sensitive detector object.";
G4Exception("G4SDStructure::AddNewDetector()","DET1010",JustWarning,ed);
#endif
RemoveSD( tgtSD );
detector.push_back( aSD );
}
}
@@ -112,6 +117,18 @@ G4VSensitiveDetector* G4SDStructure::GetSD(G4String aSDName)
return 0;
}
void G4SDStructure::RemoveSD(G4VSensitiveDetector* sd)
{
std::vector<G4VSensitiveDetector*>::iterator itr = detector.begin();
for(;itr!=detector.end();itr++)
{
if((*itr)==sd) {
detector.erase(itr);
break;
}
}
}
G4String G4SDStructure::ExtractDirName(G4String aName)
{
G4String subD = aName;
source/digits_hits/detector/src/G4SDmessenger.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4SDmessenger.cc 67992 2013-03-13 10:59:57Z gcosmo $
//
// ---------------------------------------------------------------------
source/digits_hits/detector/src/G4SensitiveVolumeList.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4SensitiveVolumeList.cc 67992 2013-03-13 10:59:57Z gcosmo $
//
// --------------------------------------------------------------
// GEANT 4 class implementation file
source/digits_hits/detector/src/G4TrackLogger.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4TrackLogger.cc 67992 2013-03-13 10:59:57Z gcosmo $
//
// ----------------------------------------------------------------------
// GEANT 4 class source file
source/digits_hits/detector/src/G4VPrimitiveScorer.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4VPrimitiveScorer.cc 67992 2013-03-13 10:59:57Z gcosmo $
//
// G4VPrimitiveScorer
#include "G4VPrimitiveScorer.hh"
source/digits_hits/detector/src/G4VReadOutGeometry.cc
+9 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4VReadOutGeometry.cc 74048 2013-09-20 09:34:57Z gcosmo $
//
#include "G4VReadOutGeometry.hh"
@@ -37,6 +37,14 @@ G4VReadOutGeometry::G4VReadOutGeometry()
{
name = "unknown";
ROnavigator = new G4Navigator();
G4ExceptionDescription ed;
ed<<"The concept and the functionality of Readout Geometry has been merged\n"
<<"into Parallel World. This G4VReadOutGeometry is kept for the sake of\n"
<<"not breaking the commonly-used interface in the sensitive detector class.\n"
<<"But this functionality of G4VReadOutGeometry class is no longer tested\n"
<<"and thus may not be working well. We strongly recommend our customers to\n"
<<"migrate to Parallel World scheme.";
G4Exception("G4VReadOutGeometry","DIGIHIT1001",JustWarning,ed);
}
G4VReadOutGeometry::G4VReadOutGeometry(const G4VReadOutGeometry &right)
source/digits_hits/detector/src/G4VSDFilter.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4VSDFilter.cc 67992 2013-03-13 10:59:57Z gcosmo $
//
// G4VSensitiveDetector
#include "G4VSDFilter.hh"
source/digits_hits/detector/src/G4VSensitiveDetector.cc
+11 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4VSensitiveDetector.cc 67992 2013-03-13 10:59:57Z gcosmo $
//
// G4VSensitiveDetector
#include "G4VSensitiveDetector.hh"
@@ -65,6 +65,16 @@ G4VSensitiveDetector::~G4VSensitiveDetector()
{
}
G4VSensitiveDetector* G4VSensitiveDetector::Clone() const
{
G4ExceptionDescription msg;
msg << "Derived class does not implement cloning,\n"
<< "but Clone method called.\n"
<< "Cannot continue;";
G4Exception("G4VSensitiveDetector::Clone","Det0010",FatalException,msg);
return NULL;
}
const G4VSensitiveDetector & G4VSensitiveDetector::operator=(const G4VSensitiveDetector &right)
{
SensitiveDetectorName = right.SensitiveDetectorName;
source/digits_hits/digits/CMakeLists.txt
+1 -1
View File
@@ -7,7 +7,7 @@
#
# Generated on : 24/9/2010
#
# $Id: CMakeLists.txt,v 1.1 2010-09-29 18:38:15 bmorgan Exp $
# $Id: CMakeLists.txt 66892 2013-01-17 10:57:59Z gunter $
#
#------------------------------------------------------------------------------
source/digits_hits/digits/GNUmakefile
+1 -1
View File
@@ -1,4 +1,4 @@
# $Id: GNUmakefile,v 1.4 2010-10-27 08:10:13 gcosmo Exp $
# $Id: GNUmakefile 66892 2013-01-17 10:57:59Z gunter $
# --------------------------------------------------------------
# GNUmakefile for digits+hits library. Makoto Asai, 1/11/96.
# --------------------------------------------------------------
source/digits_hits/digits/History
+1 -1
View File
@@ -1,4 +1,4 @@
$Id: History,v 1.2 2003-10-03 10:30:28 gcosmo Exp $
$Id: History 66892 2013-01-17 10:57:59Z gunter $
-------------------------------------------------------------------
=========================================================
source/digits_hits/digits/include/G4DCofThisEvent.hh
+5 -5
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4DCofThisEvent.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
#ifndef G4DCofThisEvent_h
@@ -88,20 +88,20 @@ class G4DCofThisEvent
};
#if defined G4DIGI_ALLOC_EXPORT
extern G4DLLEXPORT G4Allocator<G4DCofThisEvent> anDCoTHAllocator;
extern G4DLLEXPORT G4ThreadLocal G4Allocator<G4DCofThisEvent> *anDCoTHAllocator_G4MT_TLS_;
#else
extern G4DLLIMPORT G4Allocator<G4DCofThisEvent> anDCoTHAllocator;
extern G4DLLIMPORT G4ThreadLocal G4Allocator<G4DCofThisEvent> *anDCoTHAllocator_G4MT_TLS_;
#endif
inline void* G4DCofThisEvent::operator new(size_t)
{
{ ;;; if (!anDCoTHAllocator_G4MT_TLS_) anDCoTHAllocator_G4MT_TLS_ = new G4Allocator<G4DCofThisEvent> ; G4Allocator<G4DCofThisEvent> &anDCoTHAllocator = *anDCoTHAllocator_G4MT_TLS_; ;;;
void* anDCoTH;
anDCoTH = (void*)anDCoTHAllocator.MallocSingle();
return anDCoTH;
}
inline void G4DCofThisEvent::operator delete(void* anDCoTH)
{
{ ;;; if (!anDCoTHAllocator_G4MT_TLS_) anDCoTHAllocator_G4MT_TLS_ = new G4Allocator<G4DCofThisEvent> ; G4Allocator<G4DCofThisEvent> &anDCoTHAllocator = *anDCoTHAllocator_G4MT_TLS_; ;;;
anDCoTHAllocator.FreeSingle((G4DCofThisEvent*)anDCoTH);
}
source/digits_hits/digits/include/G4TDigiCollection.hh
+61 -39
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4TDigiCollection.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
#ifndef G4TDigiCollection_h
@@ -58,9 +58,9 @@ class G4DigiCollection : public G4VDigiCollection
};
#if defined G4DIGI_ALLOC_EXPORT
extern G4DLLEXPORT G4Allocator<G4DigiCollection> aDCAllocator;
extern G4DLLEXPORT G4ThreadLocal G4Allocator<G4DigiCollection> *aDCAllocator_G4MT_TLS_;
#else
extern G4DLLIMPORT G4Allocator<G4DigiCollection> aDCAllocator;
extern G4DLLIMPORT G4ThreadLocal G4Allocator<G4DigiCollection> *aDCAllocator_G4MT_TLS_;
#endif
template <class T> class G4TDigiCollection : public G4DigiCollection
@@ -84,15 +84,22 @@ template <class T> class G4TDigiCollection : public G4DigiCollection
public: // with description
inline T* operator[](size_t i) const
{ return (*((std::vector<T*>*)theCollection))[i]; }
{
if (!aDCAllocator_G4MT_TLS_) aDCAllocator_G4MT_TLS_ = new G4Allocator<G4DigiCollection>;
return (*((std::vector<T*>*)theCollection))[i];
}
// Returns a pointer to a concrete digi object.
inline std::vector<T*>* GetVector() const
{ return (std::vector<T*>*)theCollection; }
{
if (!aDCAllocator_G4MT_TLS_) aDCAllocator_G4MT_TLS_ = new G4Allocator<G4DigiCollection>;
return (std::vector<T*>*)theCollection;
}
// Returns a collection vector.
inline G4int insert(T* aHit)
{
std::vector<T*>*theDigiCollection
= (std::vector<T*>*)theCollection;
if (!aDCAllocator_G4MT_TLS_) aDCAllocator_G4MT_TLS_ = new G4Allocator<G4DigiCollection>;
std::vector<T*>*theDigiCollection
= (std::vector<T*>*)theCollection;
theDigiCollection->push_back(aHit);
return theDigiCollection->size();
}
@@ -100,7 +107,8 @@ template <class T> class G4TDigiCollection : public G4DigiCollection
// collection is returned.
inline G4int entries() const
{
std::vector<T*>*theDigiCollection
if (!aDCAllocator_G4MT_TLS_) aDCAllocator_G4MT_TLS_ = new G4Allocator<G4DigiCollection>;
std::vector<T*>*theDigiCollection
= (std::vector<T*>*)theCollection;
return theDigiCollection->size();
}
@@ -108,69 +116,83 @@ template <class T> class G4TDigiCollection : public G4DigiCollection
public:
virtual G4VDigi* GetDigi(size_t i) const
{ return (*((std::vector<T*>*)theCollection))[i]; }
{
if (!aDCAllocator_G4MT_TLS_) aDCAllocator_G4MT_TLS_ = new G4Allocator<G4DigiCollection>;
return (*((std::vector<T*>*)theCollection))[i];
}
virtual size_t GetSize() const
{ return ((std::vector<T*>*)theCollection)->size(); }
{
if (!aDCAllocator_G4MT_TLS_) aDCAllocator_G4MT_TLS_ = new G4Allocator<G4DigiCollection>;
return ((std::vector<T*>*)theCollection)->size();
}
};
template <class T> inline void* G4TDigiCollection<T>::operator new(size_t)
{
void* aDC;
aDC = (void*)aDCAllocator.MallocSingle();
return aDC;
if (!aDCAllocator_G4MT_TLS_) aDCAllocator_G4MT_TLS_ = new G4Allocator<G4DigiCollection>;
G4Allocator<G4DigiCollection> &aDCAllocator = *aDCAllocator_G4MT_TLS_;
void* aDC;
aDC = (void*)aDCAllocator.MallocSingle();
return aDC;
}
template <class T> inline void G4TDigiCollection<T>::operator delete(void* aDC)
{
aDCAllocator.FreeSingle((G4DigiCollection*)aDC);
if (!aDCAllocator_G4MT_TLS_) aDCAllocator_G4MT_TLS_ = new G4Allocator<G4DigiCollection>;
G4Allocator<G4DigiCollection> &aDCAllocator = *aDCAllocator_G4MT_TLS_; ;;;
aDCAllocator.FreeSingle((G4DigiCollection*)aDC);
}
template <class T> G4TDigiCollection<T>::G4TDigiCollection()
{
std::vector<T*> * theDigiCollection
= new std::vector<T*>;
theCollection = (void*)theDigiCollection;
{
if (!aDCAllocator_G4MT_TLS_) aDCAllocator_G4MT_TLS_ = new G4Allocator<G4DigiCollection>;
std::vector<T*> * theDigiCollection = new std::vector<T*>;
theCollection = (void*)theDigiCollection;
}
template <class T> G4TDigiCollection<T>::G4TDigiCollection(G4String detName,G4String colNam)
: G4DigiCollection(detName,colNam)
{
std::vector<T*> * theDigiCollection
= new std::vector<T*>;
theCollection = (void*)theDigiCollection;
{
if (!aDCAllocator_G4MT_TLS_) aDCAllocator_G4MT_TLS_ = new G4Allocator<G4DigiCollection>;
std::vector<T*> * theDigiCollection = new std::vector<T*>;
theCollection = (void*)theDigiCollection;
}
template <class T> G4TDigiCollection<T>::~G4TDigiCollection()
{
std::vector<T*> * theDigiCollection
= (std::vector<T*>*)theCollection;
if (!aDCAllocator_G4MT_TLS_) aDCAllocator_G4MT_TLS_ = new G4Allocator<G4DigiCollection>;
std::vector<T*> * theDigiCollection = (std::vector<T*>*)theCollection;
//theDigiCollection->clearAndDestroy();
for(size_t i=0;i<theDigiCollection->size();i++)
{ delete (*theDigiCollection)[i]; }
theDigiCollection->clear();
delete theDigiCollection;
for(size_t i=0;i<theDigiCollection->size();i++)
{ delete (*theDigiCollection)[i]; }
theDigiCollection->clear();
delete theDigiCollection;
}
template <class T> G4int G4TDigiCollection<T>::operator==(const G4TDigiCollection<T> &right) const
{ return (collectionName==right.collectionName); }
{
if (!aDCAllocator_G4MT_TLS_) aDCAllocator_G4MT_TLS_ = new G4Allocator<G4DigiCollection>;
return (collectionName==right.collectionName);
}
template <class T> void G4TDigiCollection<T>::DrawAllDigi()
{
std::vector<T*> * theDigiCollection
= (std::vector<T*>*)theCollection;
size_t n = theDigiCollection->size();
for(size_t i=0;i<n;i++)
{ (*theDigiCollection)[i]->Draw(); }
if (!aDCAllocator_G4MT_TLS_) aDCAllocator_G4MT_TLS_ = new G4Allocator<G4DigiCollection>;
std::vector<T*> * theDigiCollection = (std::vector<T*>*)theCollection;
size_t n = theDigiCollection->size();
for(size_t i=0;i<n;i++)
{ (*theDigiCollection)[i]->Draw(); }
}
template <class T> void G4TDigiCollection<T>::PrintAllDigi()
{
std::vector<T*> * theDigiCollection
= (std::vector<T*>*)theCollection;
size_t n = theDigiCollection->size();
for(size_t i=0;i<n;i++)
{ (*theDigiCollection)[i]->Print(); }
if (!aDCAllocator_G4MT_TLS_) aDCAllocator_G4MT_TLS_ = new G4Allocator<G4DigiCollection>;
std::vector<T*> * theDigiCollection = (std::vector<T*>*)theCollection;
size_t n = theDigiCollection->size();
for(size_t i=0;i<n;i++)
{ (*theDigiCollection)[i]->Print(); }
}
#endif
source/digits_hits/digits/include/G4VDigi.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4VDigi.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
#ifndef G4VDigi_h
source/digits_hits/digits/include/G4VDigiCollection.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4VDigiCollection.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
#ifndef G4VDigiCollection_h
source/digits_hits/digits/sources.cmake
+1 -1
View File
@@ -11,7 +11,7 @@
#
# Generated on : 24/9/2010
#
# $Id: sources.cmake,v 1.1 2010-09-29 18:38:24 bmorgan Exp $
# $Id: sources.cmake 66892 2013-01-17 10:57:59Z gunter $
#
#------------------------------------------------------------------------------
source/digits_hits/digits/src/G4DCofThisEvent.cc
+6 -6
View File
@@ -24,20 +24,20 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4DCofThisEvent.cc 67992 2013-03-13 10:59:57Z gcosmo $
//
#include "G4DCofThisEvent.hh"
G4Allocator<G4DCofThisEvent> anDCoTHAllocator;
G4ThreadLocal G4Allocator<G4DCofThisEvent> *anDCoTHAllocator_G4MT_TLS_ = 0;
G4DCofThisEvent::G4DCofThisEvent()
{
{ if (!anDCoTHAllocator_G4MT_TLS_) anDCoTHAllocator_G4MT_TLS_ = new G4Allocator<G4DCofThisEvent> ;
DC = new std::vector<G4VDigiCollection*>;
}
G4DCofThisEvent::G4DCofThisEvent(G4int cap)
{
{ if (!anDCoTHAllocator_G4MT_TLS_) anDCoTHAllocator_G4MT_TLS_ = new G4Allocator<G4DCofThisEvent> ;
DC = new std::vector<G4VDigiCollection*>;
for(G4int i=0;i<cap;i++)
{
@@ -46,7 +46,7 @@ G4DCofThisEvent::G4DCofThisEvent(G4int cap)
}
G4DCofThisEvent::~G4DCofThisEvent()
{
{ if (!anDCoTHAllocator_G4MT_TLS_) anDCoTHAllocator_G4MT_TLS_ = new G4Allocator<G4DCofThisEvent> ;
//DC->clearAndDestroy();
for(size_t i=0;i<DC->size();i++)
{ delete (*DC)[i]; }
@@ -55,7 +55,7 @@ G4DCofThisEvent::~G4DCofThisEvent()
}
void G4DCofThisEvent::AddDigiCollection(G4int DCID,G4VDigiCollection * aDC)
{
{ if (!anDCoTHAllocator_G4MT_TLS_) anDCoTHAllocator_G4MT_TLS_ = new G4Allocator<G4DCofThisEvent> ;
if(DCID>=0 && DCID<G4int(DC->size()))
{ (*DC)[DCID] = aDC; }
}
source/digits_hits/digits/src/G4TDigiCollection.cc
+6 -6
View File
@@ -24,23 +24,23 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4TDigiCollection.cc 67992 2013-03-13 10:59:57Z gcosmo $
//
#include "G4TDigiCollection.hh"
G4Allocator<G4DigiCollection> aDCAllocator;
G4ThreadLocal G4Allocator<G4DigiCollection> *aDCAllocator_G4MT_TLS_ = 0;
G4DigiCollection::G4DigiCollection() : theCollection((void*)0)
{;}
{ if (!aDCAllocator_G4MT_TLS_) aDCAllocator_G4MT_TLS_ = new G4Allocator<G4DigiCollection> ;;}
G4DigiCollection::G4DigiCollection(G4String detName,G4String colNam)
: G4VDigiCollection(detName,colNam), theCollection((void*)0)
{;}
{ if (!aDCAllocator_G4MT_TLS_) aDCAllocator_G4MT_TLS_ = new G4Allocator<G4DigiCollection> ;;}
G4DigiCollection::~G4DigiCollection()
{;}
{ if (!aDCAllocator_G4MT_TLS_) aDCAllocator_G4MT_TLS_ = new G4Allocator<G4DigiCollection> ;;}
G4int G4DigiCollection::operator==(const G4DigiCollection &right) const
{ return (collectionName==right.collectionName); }
{ if (!aDCAllocator_G4MT_TLS_) aDCAllocator_G4MT_TLS_ = new G4Allocator<G4DigiCollection> ; return (collectionName==right.collectionName); }
source/digits_hits/digits/src/G4VDigi.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4VDigi.cc 67992 2013-03-13 10:59:57Z gcosmo $
//
// G4VDigi
source/digits_hits/digits/src/G4VDigiCollection.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4VDigiCollection.cc 67992 2013-03-13 10:59:57Z gcosmo $
//
// G4VDigiCollection
source/digits_hits/hits/CMakeLists.txt
+1 -1
View File
@@ -7,7 +7,7 @@
#
# Generated on : 24/9/2010
#
# $Id: CMakeLists.txt,v 1.1 2010-09-29 18:38:32 bmorgan Exp $
# $Id: CMakeLists.txt 66892 2013-01-17 10:57:59Z gunter $
#
#------------------------------------------------------------------------------
source/digits_hits/hits/GNUmakefile
+1 -1
View File
@@ -1,4 +1,4 @@
# $Id: GNUmakefile,v 1.4 2010-10-27 08:10:13 gcosmo Exp $
# $Id: GNUmakefile 66892 2013-01-17 10:57:59Z gunter $
# --------------------------------------------------------------
# GNUmakefile for digits+hits library. Makoto Asai, 1/11/96.
# --------------------------------------------------------------
source/digits_hits/hits/History
+1 -1
View File
@@ -1,4 +1,4 @@
$Id: History,v 1.2 2003-10-03 10:31:40 gcosmo Exp $
$Id: History 66892 2013-01-17 10:57:59Z gunter $
-------------------------------------------------------------------
=========================================================
source/digits_hits/hits/include/G4HCofThisEvent.hh
+5 -5
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4HCofThisEvent.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
#ifndef G4HCofThisEvent_h
@@ -87,20 +87,20 @@ class G4HCofThisEvent
};
#if defined G4DIGI_ALLOC_EXPORT
extern G4DLLEXPORT G4Allocator<G4HCofThisEvent> anHCoTHAllocator;
extern G4DLLEXPORT G4ThreadLocal G4Allocator<G4HCofThisEvent> *anHCoTHAllocator_G4MT_TLS_;
#else
extern G4DLLIMPORT G4Allocator<G4HCofThisEvent> anHCoTHAllocator;
extern G4DLLIMPORT G4ThreadLocal G4Allocator<G4HCofThisEvent> *anHCoTHAllocator_G4MT_TLS_;
#endif
inline void* G4HCofThisEvent::operator new(size_t)
{
{ ;;; if (!anHCoTHAllocator_G4MT_TLS_) anHCoTHAllocator_G4MT_TLS_ = new G4Allocator<G4HCofThisEvent> ; G4Allocator<G4HCofThisEvent> &anHCoTHAllocator = *anHCoTHAllocator_G4MT_TLS_; ;;;
void* anHCoTH;
anHCoTH = (void*)anHCoTHAllocator.MallocSingle();
return anHCoTH;
}
inline void G4HCofThisEvent::operator delete(void* anHCoTH)
{
{ ;;; if (!anHCoTHAllocator_G4MT_TLS_) anHCoTHAllocator_G4MT_TLS_ = new G4Allocator<G4HCofThisEvent> ; G4Allocator<G4HCofThisEvent> &anHCoTHAllocator = *anHCoTHAllocator_G4MT_TLS_; ;;;
anHCoTHAllocator.FreeSingle((G4HCofThisEvent*)anHCoTH);
}
source/digits_hits/hits/include/G4THitsCollection.hh
+40 -22
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4THitsCollection.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
#ifndef G4THitsCollection_h
@@ -59,9 +59,9 @@ class G4HitsCollection : public G4VHitsCollection
};
#if defined G4DIGI_ALLOC_EXPORT
extern G4DLLEXPORT G4Allocator<G4HitsCollection> anHCAllocator;
extern G4DLLEXPORT G4ThreadLocal G4Allocator<G4HitsCollection> *anHCAllocator_G4MT_TLS_;
#else
extern G4DLLIMPORT G4Allocator<G4HitsCollection> anHCAllocator;
extern G4DLLIMPORT G4ThreadLocal G4Allocator<G4HitsCollection> *anHCAllocator_G4MT_TLS_;
#endif
template <class T> class G4THitsCollection : public G4HitsCollection
@@ -85,15 +85,20 @@ template <class T> class G4THitsCollection : public G4HitsCollection
public: // with description
inline T* operator[](size_t i) const
{ return (*((std::vector<T*>*)theCollection))[i]; }
{
if (!anHCAllocator_G4MT_TLS_) anHCAllocator_G4MT_TLS_ = new G4Allocator<G4HitsCollection>;
return (*((std::vector<T*>*)theCollection))[i];
}
// Returns a pointer to a concrete hit object.
inline std::vector<T*>* GetVector() const
{ return (std::vector<T*>*)theCollection; }
{
if (!anHCAllocator_G4MT_TLS_) anHCAllocator_G4MT_TLS_ = new G4Allocator<G4HitsCollection>;
return (std::vector<T*>*)theCollection; }
// Returns a collection vector.
inline G4int insert(T* aHit)
{
std::vector<T*>*theHitsCollection
= (std::vector<T*>*)theCollection;
if (!anHCAllocator_G4MT_TLS_) anHCAllocator_G4MT_TLS_ = new G4Allocator<G4HitsCollection>;
std::vector<T*>*theHitsCollection = (std::vector<T*>*)theCollection;
theHitsCollection->push_back(aHit);
return theHitsCollection->size();
}
@@ -101,22 +106,29 @@ template <class T> class G4THitsCollection : public G4HitsCollection
// collection is returned.
inline G4int entries() const
{
std::vector<T*>*theHitsCollection
= (std::vector<T*>*)theCollection;
if (!anHCAllocator_G4MT_TLS_) anHCAllocator_G4MT_TLS_ = new G4Allocator<G4HitsCollection>;
std::vector<T*>*theHitsCollection = (std::vector<T*>*)theCollection;
return theHitsCollection->size();
}
// Returns the number of hit objects stored in this collection
public:
virtual G4VHit* GetHit(size_t i) const
{ return (*((std::vector<T*>*)theCollection))[i]; }
{
if (!anHCAllocator_G4MT_TLS_) anHCAllocator_G4MT_TLS_ = new G4Allocator<G4HitsCollection>;
return (*((std::vector<T*>*)theCollection))[i];
}
virtual size_t GetSize() const
{ return ((std::vector<T*>*)theCollection)->size(); }
{
if (!anHCAllocator_G4MT_TLS_) anHCAllocator_G4MT_TLS_ = new G4Allocator<G4HitsCollection>;
return ((std::vector<T*>*)theCollection)->size(); }
};
template <class T> inline void* G4THitsCollection<T>::operator new(size_t)
{
if (!anHCAllocator_G4MT_TLS_) anHCAllocator_G4MT_TLS_ = new G4Allocator<G4HitsCollection>;
G4Allocator<G4HitsCollection> &anHCAllocator = *anHCAllocator_G4MT_TLS_; ;;;
void* anHC;
anHC = (void*)anHCAllocator.MallocSingle();
return anHC;
@@ -124,28 +136,30 @@ template <class T> inline void* G4THitsCollection<T>::operator new(size_t)
template <class T> inline void G4THitsCollection<T>::operator delete(void* anHC)
{
if (!anHCAllocator_G4MT_TLS_) anHCAllocator_G4MT_TLS_ = new G4Allocator<G4HitsCollection>;
G4Allocator<G4HitsCollection> &anHCAllocator = *anHCAllocator_G4MT_TLS_; ;;;
anHCAllocator.FreeSingle((G4HitsCollection*)anHC);
}
template <class T> G4THitsCollection<T>::G4THitsCollection()
{
std::vector<T*> * theHitsCollection
= new std::vector<T*>;
{
if (!anHCAllocator_G4MT_TLS_) anHCAllocator_G4MT_TLS_ = new G4Allocator<G4HitsCollection>;
std::vector<T*> * theHitsCollection = new std::vector<T*>;
theCollection = (void*)theHitsCollection;
}
template <class T> G4THitsCollection<T>::G4THitsCollection(G4String detName,G4String colNam)
: G4HitsCollection(detName,colNam)
{
std::vector<T*> * theHitsCollection
= new std::vector<T*>;
{
if (!anHCAllocator_G4MT_TLS_) anHCAllocator_G4MT_TLS_ = new G4Allocator<G4HitsCollection>;
std::vector<T*> * theHitsCollection = new std::vector<T*>;
theCollection = (void*)theHitsCollection;
}
template <class T> G4THitsCollection<T>::~G4THitsCollection()
{
std::vector<T*> * theHitsCollection
= (std::vector<T*>*)theCollection;
if (!anHCAllocator_G4MT_TLS_) anHCAllocator_G4MT_TLS_ = new G4Allocator<G4HitsCollection>;
std::vector<T*> * theHitsCollection = (std::vector<T*>*)theCollection;
//theHitsCollection->clearAndDestroy();
for(size_t i=0;i<theHitsCollection->size();i++)
{ delete (*theHitsCollection)[i]; }
@@ -154,12 +168,15 @@ template <class T> G4THitsCollection<T>::~G4THitsCollection()
}
template <class T> G4int G4THitsCollection<T>::operator==(const G4THitsCollection<T> &right) const
{ return (collectionName==right.collectionName); }
{
if (!anHCAllocator_G4MT_TLS_) anHCAllocator_G4MT_TLS_ = new G4Allocator<G4HitsCollection>;
return (collectionName==right.collectionName);
}
template <class T> void G4THitsCollection<T>::DrawAllHits()
{
std::vector<T*> * theHitsCollection
= (std::vector<T*>*)theCollection;
if (!anHCAllocator_G4MT_TLS_) anHCAllocator_G4MT_TLS_ = new G4Allocator<G4HitsCollection>;
std::vector<T*> * theHitsCollection = (std::vector<T*>*)theCollection;
size_t n = theHitsCollection->size();
for(size_t i=0;i<n;i++)
{ (*theHitsCollection)[i]->Draw(); }
@@ -167,6 +184,7 @@ template <class T> void G4THitsCollection<T>::DrawAllHits()
template <class T> void G4THitsCollection<T>::PrintAllHits()
{
if (!anHCAllocator_G4MT_TLS_) anHCAllocator_G4MT_TLS_ = new G4Allocator<G4HitsCollection>;
std::vector<T*> * theHitsCollection
= (std::vector<T*>*)theCollection;
size_t n = theHitsCollection->size();
source/digits_hits/hits/include/G4THitsMap.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4THitsMap.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
#ifndef G4THitsMap_h
#define G4THitsMap_h 1
source/digits_hits/hits/include/G4VHit.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4VHit.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
#ifndef G4VHit_h
source/digits_hits/hits/include/G4VHitsCollection.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4VHitsCollection.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
#ifndef G4VHitsCollection_h
source/digits_hits/hits/sources.cmake
+1 -1
View File
@@ -11,7 +11,7 @@
#
# Generated on : 24/9/2010
#
# $Id: sources.cmake,v 1.1 2010-09-29 18:38:41 bmorgan Exp $
# $Id: sources.cmake 66892 2013-01-17 10:57:59Z gunter $
#
#------------------------------------------------------------------------------
source/digits_hits/hits/src/G4HCofThisEvent.cc
+6 -6
View File
@@ -24,20 +24,20 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4HCofThisEvent.cc 67992 2013-03-13 10:59:57Z gcosmo $
//
#include "G4HCofThisEvent.hh"
G4Allocator<G4HCofThisEvent> anHCoTHAllocator;
G4ThreadLocal G4Allocator<G4HCofThisEvent> *anHCoTHAllocator_G4MT_TLS_ = 0;
G4HCofThisEvent::G4HCofThisEvent()
{
{ if (!anHCoTHAllocator_G4MT_TLS_) anHCoTHAllocator_G4MT_TLS_ = new G4Allocator<G4HCofThisEvent> ;
HC = new std::vector<G4VHitsCollection*>;
}
G4HCofThisEvent::G4HCofThisEvent(G4int cap)
{
{ if (!anHCoTHAllocator_G4MT_TLS_) anHCoTHAllocator_G4MT_TLS_ = new G4Allocator<G4HCofThisEvent> ;
HC = new std::vector<G4VHitsCollection*>;
for(G4int i=0;i<cap;i++)
{
@@ -46,7 +46,7 @@ G4HCofThisEvent::G4HCofThisEvent(G4int cap)
}
G4HCofThisEvent::~G4HCofThisEvent()
{
{ if (!anHCoTHAllocator_G4MT_TLS_) anHCoTHAllocator_G4MT_TLS_ = new G4Allocator<G4HCofThisEvent> ;
//HC->clearAndDestroy();
for(size_t i=0;i<HC->size();i++)
{ delete (*HC)[i]; }
@@ -55,7 +55,7 @@ G4HCofThisEvent::~G4HCofThisEvent()
}
void G4HCofThisEvent::AddHitsCollection(G4int HCID,G4VHitsCollection * aHC)
{
{ if (!anHCoTHAllocator_G4MT_TLS_) anHCoTHAllocator_G4MT_TLS_ = new G4Allocator<G4HCofThisEvent> ;
if(HCID>=0 && HCID<G4int(HC->size()))
{ (*HC)[HCID] = aHC; }
}
source/digits_hits/hits/src/G4THitsCollection.cc
+6 -6
View File
@@ -24,23 +24,23 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4THitsCollection.cc 67992 2013-03-13 10:59:57Z gcosmo $
//
#include "G4THitsCollection.hh"
G4Allocator<G4HitsCollection> anHCAllocator;
G4ThreadLocal G4Allocator<G4HitsCollection> *anHCAllocator_G4MT_TLS_ = 0;
G4HitsCollection::G4HitsCollection() : theCollection((void*)0)
{;}
{ if (!anHCAllocator_G4MT_TLS_) anHCAllocator_G4MT_TLS_ = new G4Allocator<G4HitsCollection> ;;}
G4HitsCollection::G4HitsCollection(G4String detName,G4String colNam)
: G4VHitsCollection(detName,colNam), theCollection((void*)0)
{;}
{ if (!anHCAllocator_G4MT_TLS_) anHCAllocator_G4MT_TLS_ = new G4Allocator<G4HitsCollection> ;;}
G4HitsCollection::~G4HitsCollection()
{;}
{ if (!anHCAllocator_G4MT_TLS_) anHCAllocator_G4MT_TLS_ = new G4Allocator<G4HitsCollection> ;;}
int G4HitsCollection::operator==(const G4HitsCollection &right) const
{ return (collectionName==right.collectionName); }
{ if (!anHCAllocator_G4MT_TLS_) anHCAllocator_G4MT_TLS_ = new G4Allocator<G4HitsCollection> ; return (collectionName==right.collectionName); }
source/digits_hits/hits/src/G4VHit.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4VHit.cc 67992 2013-03-13 10:59:57Z gcosmo $
//
// G4VHit
source/digits_hits/hits/src/G4VHitsCollection.cc
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4VHitsCollection.cc 67992 2013-03-13 10:59:57Z gcosmo $
//
// G4VHitsCollection
source/digits_hits/scorer/CMakeLists.txt
+1 -1
View File
@@ -7,7 +7,7 @@
#
# Generated on : 24/9/2010
#
# $Id: CMakeLists.txt,v 1.1 2010-09-29 18:38:50 bmorgan Exp $
# $Id: CMakeLists.txt 66892 2013-01-17 10:57:59Z gunter $
#
#------------------------------------------------------------------------------
source/digits_hits/scorer/GNUmakefile
+1 -1
View File
@@ -1,4 +1,4 @@
# $Id: GNUmakefile,v 1.3 2010-10-27 08:10:13 gcosmo Exp $
# $Id: GNUmakefile 66892 2013-01-17 10:57:59Z gunter $
# --------------------------------------------------------------
# GNUmakefile for digits+hits library. Makoto Asai, 1/11/96.
# --------------------------------------------------------------
source/digits_hits/scorer/History
+4 -1
View File
@@ -1,4 +1,4 @@
$Id: History,v 1.1 2007-07-11 01:27:26 asaim Exp $
$Id: History 76272 2013-11-08 11:53:00Z gcosmo $
-------------------------------------------------------------------
=========================================================
@@ -17,6 +17,9 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
November 7 2013 Gabriele Cosmo (detscorer-V09-06-00)
- Replaced deprecated calls to G4Sphere accessor methods.
July 11, 2007 M.Asai (detscorer-V09-00-00)
- Moved from digits_hits/utilis.
source/digits_hits/scorer/include/G4PSCellCharge.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4PSCellCharge.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
#ifndef G4PSCellCharge_h
source/digits_hits/scorer/include/G4PSCellCharge3D.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4PSCellCharge3D.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
#ifndef G4PSCellCharge3D_h
source/digits_hits/scorer/include/G4PSCellFlux.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4PSCellFlux.hh 67992 2013-03-13 10:59:57Z gcosmo $
// GEANT4 tag $Name: geant4-09-04 $
//
source/digits_hits/scorer/include/G4PSCellFlux3D.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4PSCellFlux3D.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
#ifndef G4PSCellFlux3D_h
source/digits_hits/scorer/include/G4PSCylinderSurfaceCurrent.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4PSCylinderSurfaceCurrent.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
#ifndef G4PSCylinderSurfaceCurrent_h
source/digits_hits/scorer/include/G4PSCylinderSurfaceCurrent3D.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4PSCylinderSurfaceCurrent3D.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
#ifndef G4PSCylinderSurfaceCurrent3D_h
source/digits_hits/scorer/include/G4PSCylinderSurfaceFlux.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4PSCylinderSurfaceFlux.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
#ifndef G4PSCylinderSurfaceFlux_h
source/digits_hits/scorer/include/G4PSCylinderSurfaceFlux3D.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4PSCylinderSurfaceFlux3D.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
#ifndef G4PSCylinderSurfaceFlux3D_h
source/digits_hits/scorer/include/G4PSDirectionFlag.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4PSDirectionFlag.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
//
//---------------------------------------------------------------
source/digits_hits/scorer/include/G4PSDoseDeposit.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4PSDoseDeposit.hh 67992 2013-03-13 10:59:57Z gcosmo $
// GEANT4 tag $Name: geant4-09-04 $
//
source/digits_hits/scorer/include/G4PSDoseDeposit3D.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4PSDoseDeposit3D.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
#ifndef G4PSDoseDeposit3D_h
source/digits_hits/scorer/include/G4PSDoseDepositForCylinder3D.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4PSDoseDepositForCylinder3D.hh 67992 2013-03-13 10:59:57Z gcosmo $
// GEANT4 tag $Name: geant4-09-04 $
//
source/digits_hits/scorer/include/G4PSEnergyDeposit.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4PSEnergyDeposit.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
#ifndef G4PSEnergyDeposit_h
source/digits_hits/scorer/include/G4PSEnergyDeposit3D.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4PSEnergyDeposit3D.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
#ifndef G4PSEnergyDeposit3D_h
source/digits_hits/scorer/include/G4PSFlatSurfaceCurrent.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4PSFlatSurfaceCurrent.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
#ifndef G4PSFlatSurfaceCurrent_h
source/digits_hits/scorer/include/G4PSFlatSurfaceCurrent3D.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4PSFlatSurfaceCurrent3D.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
#ifndef G4PSFlatSurfaceCurrent3D_h
source/digits_hits/scorer/include/G4PSFlatSurfaceFlux.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4PSFlatSurfaceFlux.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
#ifndef G4PSFlatSurfaceFlux_h
source/digits_hits/scorer/include/G4PSFlatSurfaceFlux3D.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4PSFlatSurfaceFlux3D.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
#ifndef G4PSFlatSurfaceFlux3D_h
source/digits_hits/scorer/include/G4PSMinKinEAtGeneration.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4PSMinKinEAtGeneration.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
#ifndef G4PSMinKinEAtGeneration_h
source/digits_hits/scorer/include/G4PSMinKinEAtGeneration3D.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4PSMinKinEAtGeneration3D.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
#ifndef G4PSMinKinEAtGeneration3D_h
source/digits_hits/scorer/include/G4PSNofCollision.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4PSNofCollision.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
#ifndef G4PSNofCollision_h
source/digits_hits/scorer/include/G4PSNofCollision3D.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4PSNofCollision3D.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
#ifndef G4PSNofCollision3D_h
source/digits_hits/scorer/include/G4PSNofSecondary.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4PSNofSecondary.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
#ifndef G4PSNofSecondary_h
source/digits_hits/scorer/include/G4PSNofSecondary3D.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4PSNofSecondary3D.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
#ifndef G4PSNofSecondary3D_h
source/digits_hits/scorer/include/G4PSNofStep.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4PSNofStep.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
#ifndef G4PSNofStep_h
source/digits_hits/scorer/include/G4PSNofStep3D.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4PSNofStep3D.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
#ifndef G4PSNofStep3D_h
source/digits_hits/scorer/include/G4PSPassageCellCurrent.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4PSPassageCellCurrent.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
#ifndef G4PSPassageCellCurrent_h
source/digits_hits/scorer/include/G4PSPassageCellCurrent3D.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4PSPassageCellCurrent3D.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
#ifndef G4PSPassageCellCurrent3D_h
source/digits_hits/scorer/include/G4PSPassageCellFlux.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4PSPassageCellFlux.hh 67992 2013-03-13 10:59:57Z gcosmo $
// GEANT4 tag $Name: geant4-09-04 $
//
source/digits_hits/scorer/include/G4PSPassageCellFlux3D.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4PSPassageCellFlux3D.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
#ifndef G4PSPassageCellFlux3D_h
source/digits_hits/scorer/include/G4PSPassageCellFluxForCylinder3D.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4PSPassageCellFluxForCylinder3D.hh 67992 2013-03-13 10:59:57Z gcosmo $
// GEANT4 tag $Name: geant4-09-04 $
//
source/digits_hits/scorer/include/G4PSPassageTrackLength.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4PSPassageTrackLength.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
#ifndef G4PSPassageTrackLength_h
source/digits_hits/scorer/include/G4PSPassageTrackLength3D.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4PSPassageTrackLength3D.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
#ifndef G4PSPassageTrackLength3D_h
source/digits_hits/scorer/include/G4PSPopulation.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4PSPopulation.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
#ifndef G4PSPopulation_h
source/digits_hits/scorer/include/G4PSPopulation3D.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4PSPopulation3D.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
#ifndef G4PSPopulation3D_h
source/digits_hits/scorer/include/G4PSSphereSurfaceCurrent.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4PSSphereSurfaceCurrent.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
#ifndef G4PSSphereSurfaceCurrent_h
source/digits_hits/scorer/include/G4PSSphereSurfaceCurrent3D.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4PSSphereSurfaceCurrent3D.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
#ifndef G4PSSphereSurfaceCurrent3D_h
source/digits_hits/scorer/include/G4PSSphereSurfaceFlux.hh
+1 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id$
// $Id: G4PSSphereSurfaceFlux.hh 67992 2013-03-13 10:59:57Z gcosmo $
//
#ifndef G4PSSphereSurfaceFlux_h

Some files were not shown because too many files have changed in this diff Show More