Import Geant4 10.5.1 source tree
This commit is contained in:
@@ -10,6 +10,9 @@
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
31 January 2019, I. Hrivnacova (exparallel-V10-04-00)
|
||||
- Merged GitHub PR #4: all Boolean operators now return G4bool.
|
||||
|
||||
03 December 2013, I. Hrivnacova (exparallel-V09-06-04)
|
||||
- Fixed file descriptions (for Doxygen)
|
||||
|
||||
|
||||
@@ -51,7 +51,7 @@ class B2TrackerHit : public G4VHit
|
||||
|
||||
// operators
|
||||
const B2TrackerHit& operator=(const B2TrackerHit&);
|
||||
G4int operator==(const B2TrackerHit&) const;
|
||||
G4bool operator==(const B2TrackerHit&) const;
|
||||
|
||||
inline void* operator new(size_t);
|
||||
inline void operator delete(void*);
|
||||
|
||||
@@ -77,9 +77,9 @@ const B2TrackerHit& B2TrackerHit::operator=(const B2TrackerHit& right)
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
G4int B2TrackerHit::operator==(const B2TrackerHit& right) const
|
||||
G4bool B2TrackerHit::operator==(const B2TrackerHit& right) const
|
||||
{
|
||||
return ( this == &right ) ? 1 : 0;
|
||||
return ( this == &right ) ? true : false;
|
||||
}
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
@@ -74,7 +74,7 @@
|
||||
G4HitsCollection();
|
||||
G4HitsCollection(G4String detName,G4String colNam);
|
||||
virtual ~G4HitsCollection();
|
||||
G4int operator==(const G4HitsCollection &right) const;
|
||||
G4bool operator==(const G4HitsCollection &right) const;
|
||||
|
||||
protected:
|
||||
void* theCollection;
|
||||
@@ -103,7 +103,7 @@ public:
|
||||
// constructor.
|
||||
public:
|
||||
virtual ~G4TAtomicHitsCollection();
|
||||
G4int operator==(const G4TAtomicHitsCollection<T> &right) const;
|
||||
G4bool operator==(const G4TAtomicHitsCollection<T> &right) const;
|
||||
|
||||
//inline void *operator new(size_t);
|
||||
//inline void operator delete(void* anHC);
|
||||
@@ -179,7 +179,7 @@ template <class T> G4TAtomicHitsCollection<T>::~G4TAtomicHitsCollection()
|
||||
}
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
template <class T>
|
||||
G4int G4TAtomicHitsCollection<T>
|
||||
G4bool G4TAtomicHitsCollection<T>
|
||||
::operator==(const G4TAtomicHitsCollection<T> &right) const
|
||||
{
|
||||
return (collectionName == right.collectionName);
|
||||
|
||||
@@ -91,7 +91,7 @@ public: // with description
|
||||
|
||||
public:
|
||||
virtual ~G4TAtomicHitsMap();
|
||||
G4int operator==(const G4TAtomicHitsMap<T> &right) const;
|
||||
G4bool operator==(const G4TAtomicHitsMap<T> &right) const;
|
||||
G4TAtomicHitsMap<T> & operator+=(const G4TAtomicHitsMap<T> &right) const;
|
||||
G4TAtomicHitsMap<T> & operator+=(const G4THitsMap<T> &right) const;
|
||||
|
||||
@@ -174,7 +174,7 @@ G4TAtomicHitsMap<T>::~G4TAtomicHitsMap()
|
||||
}
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
template <typename T>
|
||||
G4int G4TAtomicHitsMap<T>::operator==(const G4TAtomicHitsMap<T> &right) const
|
||||
G4bool G4TAtomicHitsMap<T>::operator==(const G4TAtomicHitsMap<T> &right) const
|
||||
{
|
||||
return (collectionName == right.collectionName);
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -55,7 +55,7 @@ class G4HitsCollection : public G4VHitsCollection
|
||||
G4HitsCollection();
|
||||
G4HitsCollection(G4String detName,G4String colNam);
|
||||
virtual ~G4HitsCollection();
|
||||
G4int operator==(const G4HitsCollection &right) const;
|
||||
G4bool operator==(const G4HitsCollection &right) const;
|
||||
|
||||
protected:
|
||||
void* theCollection; /*MSH: ptr_as_array
|
||||
@@ -84,7 +84,7 @@ template <class T> class G4THitsCollection : public G4HitsCollection
|
||||
// constructor.
|
||||
public:
|
||||
virtual ~G4THitsCollection();
|
||||
G4int operator==(const G4THitsCollection<T> &right) const;
|
||||
G4bool operator==(const G4THitsCollection<T> &right) const;
|
||||
|
||||
inline void *operator new(size_t);
|
||||
inline void operator delete(void* anHC);
|
||||
@@ -167,7 +167,7 @@ template <class T> G4THitsCollection<T>::~G4THitsCollection()
|
||||
delete theHitsCollection;
|
||||
}
|
||||
|
||||
template <class T> G4int G4THitsCollection<T>::operator==(const G4THitsCollection<T> &right) const
|
||||
template <class T> G4bool G4THitsCollection<T>::operator==(const G4THitsCollection<T> &right) const
|
||||
{ return (collectionName==right.collectionName); }
|
||||
|
||||
template <class T> void G4THitsCollection<T>::DrawAllHits()
|
||||
|
||||
@@ -51,7 +51,7 @@ class G4VHitsCollection
|
||||
G4VHitsCollection();
|
||||
G4VHitsCollection(G4String detName,G4String colNam);
|
||||
virtual ~G4VHitsCollection();
|
||||
G4int operator==(const G4VHitsCollection &right) const;
|
||||
G4bool operator==(const G4VHitsCollection &right) const;
|
||||
|
||||
virtual void DrawAllHits();
|
||||
virtual void PrintAllHits();
|
||||
|
||||
@@ -54,7 +54,7 @@ class ExN02TrackerHit : public G4VHit
|
||||
|
||||
ExN02TrackerHit(const ExN02TrackerHit&);
|
||||
const ExN02TrackerHit& operator=(const ExN02TrackerHit&);
|
||||
G4int operator==(const ExN02TrackerHit&) const;
|
||||
G4bool operator==(const ExN02TrackerHit&) const;
|
||||
|
||||
inline void* operator new(size_t);
|
||||
inline void operator delete(void*);
|
||||
|
||||
@@ -72,9 +72,9 @@ const ExN02TrackerHit& ExN02TrackerHit::operator=(const ExN02TrackerHit& right)
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
G4int ExN02TrackerHit::operator==(const ExN02TrackerHit& right) const
|
||||
G4bool ExN02TrackerHit::operator==(const ExN02TrackerHit& right) const
|
||||
{
|
||||
return (this==&right) ? 1 : 0;
|
||||
return (this==&right) ? true : false;
|
||||
}
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
|
||||
|
||||
@@ -65,7 +65,7 @@ class G4HitsCollection : public G4VHitsCollection
|
||||
G4HitsCollection();
|
||||
G4HitsCollection(G4String detName,G4String colNam);
|
||||
virtual ~G4HitsCollection();
|
||||
G4int operator==(const G4HitsCollection &right) const;
|
||||
G4bool operator==(const G4HitsCollection &right) const;
|
||||
|
||||
protected:
|
||||
void* theCollection; /*MSH: ptr_as_array
|
||||
@@ -117,7 +117,7 @@ template <class T> class G4THitsCollection : public G4HitsCollection
|
||||
// constructor.
|
||||
public:
|
||||
virtual ~G4THitsCollection();
|
||||
G4int operator==(const G4THitsCollection<T> &right) const;
|
||||
G4bool operator==(const G4THitsCollection<T> &right) const;
|
||||
|
||||
inline void *operator new(size_t);
|
||||
inline void operator delete(void* anHC);
|
||||
@@ -200,7 +200,7 @@ template <class T> G4THitsCollection<T>::~G4THitsCollection()
|
||||
delete theHitsCollection;
|
||||
}
|
||||
|
||||
template <class T> G4int G4THitsCollection<T>::operator==(const G4THitsCollection<T> &right) const
|
||||
template <class T> G4bool G4THitsCollection<T>::operator==(const G4THitsCollection<T> &right) const
|
||||
{ return (collectionName==right.collectionName); }
|
||||
|
||||
template <class T> void G4THitsCollection<T>::DrawAllHits()
|
||||
|
||||
@@ -51,7 +51,7 @@ class G4VHitsCollection
|
||||
G4VHitsCollection();
|
||||
G4VHitsCollection(G4String detName,G4String colNam);
|
||||
virtual ~G4VHitsCollection();
|
||||
G4int operator==(const G4VHitsCollection &right) const;
|
||||
G4bool operator==(const G4VHitsCollection &right) const;
|
||||
|
||||
virtual void DrawAllHits();
|
||||
virtual void PrintAllHits();
|
||||
|
||||
@@ -56,7 +56,7 @@ class ExN04CalorimeterHit : public G4VHit
|
||||
~ExN04CalorimeterHit();
|
||||
ExN04CalorimeterHit(const ExN04CalorimeterHit &right);
|
||||
const ExN04CalorimeterHit& operator=(const ExN04CalorimeterHit &right);
|
||||
G4int operator==(const ExN04CalorimeterHit &right) const;
|
||||
G4bool operator==(const ExN04CalorimeterHit &right) const;
|
||||
|
||||
inline void *operator new(size_t);
|
||||
inline void operator delete(void *aHit);
|
||||
|
||||
@@ -49,7 +49,7 @@ class ExN04MuonHit : public G4VHit
|
||||
~ExN04MuonHit();
|
||||
ExN04MuonHit(const ExN04MuonHit &right);
|
||||
const ExN04MuonHit& operator=(const ExN04MuonHit &right);
|
||||
G4int operator==(const ExN04MuonHit &right) const;
|
||||
G4bool operator==(const ExN04MuonHit &right) const;
|
||||
|
||||
|
||||
inline void *operator new(size_t);
|
||||
|
||||
@@ -54,7 +54,7 @@ class ExN04TrackerHit : public G4VHit
|
||||
|
||||
ExN04TrackerHit(const ExN04TrackerHit &right);
|
||||
const ExN04TrackerHit& operator=(const ExN04TrackerHit &right);
|
||||
G4int operator==(const ExN04TrackerHit &right) const;
|
||||
G4bool operator==(const ExN04TrackerHit &right) const;
|
||||
|
||||
inline void* operator new(size_t);
|
||||
inline void operator delete(void* aHit);
|
||||
|
||||
@@ -69,7 +69,7 @@ const ExN04CalorimeterHit& ExN04CalorimeterHit::operator=(const ExN04Calorimeter
|
||||
return *this;
|
||||
}
|
||||
|
||||
G4int ExN04CalorimeterHit::operator==(const ExN04CalorimeterHit &right) const
|
||||
G4bool ExN04CalorimeterHit::operator==(const ExN04CalorimeterHit &right) const
|
||||
{
|
||||
return ((ZCellID==right.ZCellID)&&(PhiCellID==right.PhiCellID));
|
||||
}
|
||||
|
||||
@@ -57,9 +57,9 @@ const ExN04MuonHit& ExN04MuonHit::operator=(const ExN04MuonHit &right)
|
||||
return *this;
|
||||
}
|
||||
|
||||
G4int ExN04MuonHit::operator==(const ExN04MuonHit &right) const
|
||||
G4bool ExN04MuonHit::operator==(const ExN04MuonHit &right) const
|
||||
{
|
||||
return (this==&right) ? 1 : 0;
|
||||
return (this==&right) ? true : false;
|
||||
}
|
||||
|
||||
void ExN04MuonHit::Draw()
|
||||
|
||||
@@ -57,9 +57,9 @@ const ExN04TrackerHit& ExN04TrackerHit::operator=(const ExN04TrackerHit &right)
|
||||
return *this;
|
||||
}
|
||||
|
||||
G4int ExN04TrackerHit::operator==(const ExN04TrackerHit &right) const
|
||||
G4bool ExN04TrackerHit::operator==(const ExN04TrackerHit &right) const
|
||||
{
|
||||
return (this==&right) ? 1 : 0;
|
||||
return (this==&right) ? true : false;
|
||||
}
|
||||
|
||||
void ExN04TrackerHit::Draw()
|
||||
|
||||
Reference in New Issue
Block a user