Import Geant4 10.3.0 source tree
This commit is contained in:
@@ -23,7 +23,7 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: B4Analysis.hh 68058 2013-03-13 14:47:43Z gcosmo $
|
||||
// $Id: B4Analysis.hh 100946 2016-11-03 11:28:08Z gcosmo $
|
||||
//
|
||||
/// \file B4Analysis.hh
|
||||
/// \brief Selection of the analysis technology
|
||||
@@ -32,6 +32,7 @@
|
||||
#define B4Analysis_h 1
|
||||
|
||||
#include "g4root.hh"
|
||||
//#include "g4cvs.hh"
|
||||
//#include "g4xml.hh"
|
||||
|
||||
#endif
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: B4cCalorHit.hh 69223 2013-04-23 12:36:10Z gcosmo $
|
||||
// $Id: B4cCalorHit.hh 100946 2016-11-03 11:28:08Z gcosmo $
|
||||
//
|
||||
/// \file B4cCalorHit.hh
|
||||
/// \brief Definition of the B4cCalorHit class
|
||||
@@ -35,7 +35,7 @@
|
||||
#include "G4THitsCollection.hh"
|
||||
#include "G4Allocator.hh"
|
||||
#include "G4ThreeVector.hh"
|
||||
#include "tls.hh"
|
||||
#include "G4Threading.hh"
|
||||
|
||||
/// Calorimeter hit class
|
||||
///
|
||||
@@ -75,7 +75,7 @@ class B4cCalorHit : public G4VHit
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
typedef G4THitsCollection<B4cCalorHit> B4cCalorHitsCollection;
|
||||
using B4cCalorHitsCollection = G4THitsCollection<B4cCalorHit>;
|
||||
|
||||
extern G4ThreadLocal G4Allocator<B4cCalorHit>* B4cCalorHitAllocator;
|
||||
|
||||
@@ -83,8 +83,9 @@ extern G4ThreadLocal G4Allocator<B4cCalorHit>* B4cCalorHitAllocator;
|
||||
|
||||
inline void* B4cCalorHit::operator new(size_t)
|
||||
{
|
||||
if(!B4cCalorHitAllocator)
|
||||
if (!B4cCalorHitAllocator) {
|
||||
B4cCalorHitAllocator = new G4Allocator<B4cCalorHit>;
|
||||
}
|
||||
void *hit;
|
||||
hit = (void *) B4cCalorHitAllocator->MallocSingle();
|
||||
return hit;
|
||||
@@ -92,8 +93,9 @@ inline void* B4cCalorHit::operator new(size_t)
|
||||
|
||||
inline void B4cCalorHit::operator delete(void *hit)
|
||||
{
|
||||
if(!B4cCalorHitAllocator)
|
||||
if (!B4cCalorHitAllocator) {
|
||||
B4cCalorHitAllocator = new G4Allocator<B4cCalorHit>;
|
||||
}
|
||||
B4cCalorHitAllocator->FreeSingle((B4cCalorHit*) hit);
|
||||
}
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: B4cCalorimeterSD.hh 68058 2013-03-13 14:47:43Z gcosmo $
|
||||
// $Id: B4cCalorimeterSD.hh 100946 2016-11-03 11:28:08Z gcosmo $
|
||||
//
|
||||
/// \file B4cCalorimeterSD.hh
|
||||
/// \brief Definition of the B4cCalorimeterSD class
|
||||
@@ -63,7 +63,7 @@ class B4cCalorimeterSD : public G4VSensitiveDetector
|
||||
|
||||
private:
|
||||
B4cCalorHitsCollection* fHitsCollection;
|
||||
G4int fNofCells;
|
||||
G4int fNofCells;
|
||||
};
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
Reference in New Issue
Block a user