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

Import Geant4 3.1.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-08 16:03:00 +02:00
parent cfcb558cfe
commit 137e303ecc
2843 changed files with 37082 additions and 38426 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/GNUmakefile
+3 -1
View File
@@ -1,4 +1,4 @@
# $Id: GNUmakefile,v 1.25 2000/12/13 08:25:34 gcosmo Exp $
# $Id: GNUmakefile,v 1.26 2001/02/12 08:17:31 gcosmo Exp $
# -----------------------------------------------------------------
# "gmake" makes default libraries for each subdomain.
# "gmake global" makes global libraries for each subdomain.
@@ -138,3 +138,5 @@ clean_all:
@rm -rf $(G4LIB)
@echo Removing $(G4BIN) ...
@rm -rf $(G4BIN)
@echo Removing $(G4INCLUDE) ...
@rm -rf $(G4INCLUDE)
source/analysis/Lab/include/G4LabSystem.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4LabSystem.hh,v 1.2 2000/11/16 13:44:38 barrand Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
//
// Guy Barrand 14 September 2000
source/analysis/Lab/src/G4LabSystem.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4LabSystem.cc,v 1.2 2000/11/16 13:44:41 barrand Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
//
// Guy Barrand 14 September 2000
source/analysis/Lizard/include/G4LizardSystem.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4LizardSystem.hh,v 1.5 2000/11/16 13:44:41 barrand Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
//
// Guy Barrand 14 September 2000
source/analysis/Lizard/src/G4LizardSystem.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4LizardSystem.cc,v 1.8 2000/11/17 08:16:45 barrand Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
//
// Guy Barrand 14 September 2000
source/analysis/jas/include/G4JasSystem.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4JasSystem.hh,v 1.8 2000/11/16 13:44:43 barrand Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
//
// Guy Barrand 14 September 2000
source/analysis/jas/src/G4JasSystem.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4JasSystem.cc,v 1.8 2000/11/16 13:44:43 barrand Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
//
// Guy Barrand 14 September 2000
source/analysis/management/include/G4AnalysisManager.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4AnalysisManager.hh,v 1.8 2000/11/16 13:44:45 barrand Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
//
// Guy Barrand 20th Mai 2000
source/analysis/management/include/G4VAnalysisManager.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4VAnalysisManager.hh,v 1.5 2000/11/16 13:44:46 barrand Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
// Guy Barrand 20th Mai 2000
//
source/analysis/management/include/G4VAnalysisSystem.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4VAnalysisSystem.hh,v 1.8 2000/11/16 13:44:46 barrand Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
//
source/analysis/management/src/G4AnalysisManager.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4AnalysisManager.cc,v 1.10 2000/11/21 15:41:25 barrand Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
// Guy Barrand 20th Mai 2000
//
source/digits+hits/History
+22 -1
View File
@@ -1,4 +1,4 @@
$Id: History,v 1.3 1999/11/09 00:46:57 asaim Exp $
$Id: History,v 1.4 2001/02/08 06:11:34 asaim Exp $
-------------------------------------------------------------------
=========================================================
@@ -17,6 +17,27 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
Feb 8, 2001, M.Asai (digits+hits-V03-00-01)
- STL vector classes migration
affected files :
./digits+hits/detector/include/G4HCtable.hh
./digits+hits/detector/include/G4SDStructure.hh
./digits+hits/detector/include/G4SensitiveVolumeList.hh
./digits+hits/detector/include/G4SensitiveVolumeList.icc
./digits+hits/detector/include/G4VSensitiveDetector.hh
./digits+hits/detector/include/G4CollectionNameVector.hh
./digits+hits/detector/src/G4HCtable.cc
./digits+hits/detector/src/G4SDStructure.cc
./digits+hits/detector/src/G4SensitiveVolumeList.cc
./digits+hits/detector/src/G4VSensitiveDetector.cc
./digits+hits/digits/include/G4DCofThisEvent.hh
./digits+hits/digits/include/G4TDigiCollection.hh
./digits+hits/digits/src/G4DCofThisEvent.cc
./digits+hits/hits/include/G4HCofThisEvent.hh
./digits+hits/hits/include/G4THitsCollection.hh
./digits+hits/hits/src/G4HCofThisEvent.cc
Nov 4, 99, M.Asai (tag digits+hits-V00-01-00)
- Comments are enriched for software reference manual.
source/digits+hits/detector/GNUmakefile
+1 -2
View File
@@ -1,4 +1,4 @@
# $Id: GNUmakefile,v 1.1 1999/01/07 16:06:24 gunter Exp $
# $Id: GNUmakefile,v 1.2 2000/01/31 09:36:55 gcosmo Exp $
# --------------------------------------------------------------
# GNUmakefile for digits+hits library. Makoto Asai, 1/11/96.
# --------------------------------------------------------------
@@ -16,7 +16,6 @@ CPPFLAGS += \
-I$(G4BASE)/global/management/include \
-I$(G4BASE)/global/HEPGeometry/include \
-I$(G4BASE)/track/include \
-I$(G4BASE)/processes/management/include \
-I$(G4BASE)/particles/management/include \
-I$(G4BASE)/materials/include \
-I$(G4BASE)/geometry/management/include \
source/digits+hits/detector/include/G4CollectionNameVector.hh
+28
View File
@@ -0,0 +1,28 @@
// This code implementation is the intellectual property of
// the GEANT4 collaboration.
//
// By copying, distributing or modifying the Program (or any work
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4CollectionNameVector.hh,v 1.1 2001/02/08 06:08:53 asaim Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
#ifndef G4CollectionNameVector_H
#define G4CollectionNameVector_H 1
#include "globals.hh"
#include "g4std/vector"
class G4CollectionNameVector : public G4std::vector<G4String>
{
public:
G4CollectionNameVector() {;}
virtual ~G4CollectionNameVector() {;}
void insert(G4String s) { push_back(s); }
};
#endif
source/digits+hits/detector/include/G4HCtable.hh
+7 -6
View File
@@ -5,15 +5,16 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4HCtable.hh,v 1.2.2.1.2.1 1999/12/07 20:47:41 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// $Id: G4HCtable.hh,v 1.5 2001/02/08 06:07:10 asaim Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
#ifndef G4HCtable_H
#define G4HCtable_H 1
#include "globals.hh"
#include "g4rw/tvordvec.h"
//#include "g4rw/tvordvec.h"
#include "g4std/vector"
// class description:
//
@@ -38,12 +39,12 @@ class G4HCtable
G4int GetCollectionID(G4String HCname);
private:
G4RWTValOrderedVector<G4String> SDlist;
G4RWTValOrderedVector<G4String> HClist;
G4std::vector<G4String> SDlist;
G4std::vector<G4String> HClist;
public:
inline G4int entries() const
{ return HClist.entries(); }
{ return HClist.size(); }
};
source/digits+hits/detector/include/G4SDManager.hh
+2 -2
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4SDManager.hh,v 1.2.4.1 1999/12/07 20:47:41 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// $Id: G4SDManager.hh,v 1.3 1999/12/15 14:49:33 gunter Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
#ifndef G4SDManager_h
source/digits+hits/detector/include/G4SDStructure.hh
+10 -9
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4SDStructure.hh,v 1.2.2.1.2.1 1999/12/07 20:47:41 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// $Id: G4SDStructure.hh,v 1.5 2001/02/08 06:07:11 asaim Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
#ifndef G4SDStructure_h
@@ -17,7 +17,8 @@
// G4VSensitiveDetector
#include "G4VSensitiveDetector.hh"
// G4RWTPtrOrderedVector
#include "g4rw/tpordvec.h"
//#include "g4rw/tpordvec.h"
#include "g4std/vector"
class G4HCofThisEvent;
@@ -48,8 +49,8 @@ class G4SDStructure
G4String ExtractDirName(G4String aPath);
private:
G4RWTPtrOrderedVector<G4SDStructure> structure;
G4RWTPtrOrderedVector<G4VSensitiveDetector> detector;
G4std::vector<G4SDStructure*> structure;
G4std::vector<G4VSensitiveDetector*> detector;
G4String pathName;
G4String dirName;
G4int verboseLevel;
@@ -58,10 +59,10 @@ class G4SDStructure
inline void SetVerboseLevel(G4int vl)
{
verboseLevel = vl;
for(int i=0; i<structure.entries(); i++)
{ structure(i)->SetVerboseLevel(vl); }
for(int j=0; j<detector.entries(); j++)
{ detector(j)->SetVerboseLevel(vl); }
for(int i=0; i<structure.size(); i++)
{ structure[i]->SetVerboseLevel(vl); }
for(int j=0; j<detector.size(); j++)
{ detector[j]->SetVerboseLevel(vl); }
};
};
source/digits+hits/detector/include/G4SDmessenger.hh
+2 -2
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4SDmessenger.hh,v 1.2.4.1 1999/12/07 20:47:42 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// $Id: G4SDmessenger.hh,v 1.3 1999/12/15 14:49:35 gunter Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
#ifndef G4SDmessenger_h
source/digits+hits/detector/include/G4SensitiveVolumeList.hh
+11 -10
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4SensitiveVolumeList.hh,v 1.2.2.1.2.1 1999/12/07 20:47:42 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// $Id: G4SensitiveVolumeList.hh,v 1.5 2001/02/08 06:07:11 asaim Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// ------------------------------------------------------------
// GEANT 4 class header file --- Copyright CERN 1996
@@ -22,8 +22,9 @@
#ifndef G4SensitiveVolumeList_h
#define G4SensitiveVolumeList_h 1
#include "g4rw/tpordvec.h"
#include "g4rw/tvordvec.h"
//#include "g4rw/tpordvec.h"
//#include "g4rw/tvordvec.h"
#include "g4std/vector"
#include "G4LogicalVolume.hh"
#include "G4VPhysicalVolume.hh"
@@ -60,11 +61,11 @@ class G4SensitiveVolumeList
G4bool CheckLV(const G4LogicalVolume *lvp) const;
//Get and Set Operations for Has Relationships
const G4RWTPtrOrderedVector<G4VPhysicalVolume>& GetThePhysicalVolumeList() const;
void SetThePhysicalVolumeList(const G4RWTPtrOrderedVector<G4VPhysicalVolume> value);
const G4std::vector<G4VPhysicalVolume*>& GetThePhysicalVolumeList() const;
void SetThePhysicalVolumeList(const G4std::vector<G4VPhysicalVolume*> value);
const G4RWTPtrOrderedVector<G4LogicalVolume>& GetTheLogicalVolumeList() const;
void SetTheLogicalVolumeList(const G4RWTPtrOrderedVector<G4LogicalVolume> value);
const G4std::vector<G4LogicalVolume*>& GetTheLogicalVolumeList() const;
void SetTheLogicalVolumeList(const G4std::vector<G4LogicalVolume*> value);
@@ -72,8 +73,8 @@ class G4SensitiveVolumeList
//Data Members for Has Relationships
G4RWTPtrOrderedVector<G4VPhysicalVolume> thePhysicalVolumeList;
G4RWTPtrOrderedVector<G4LogicalVolume> theLogicalVolumeList;
G4std::vector<G4VPhysicalVolume*> thePhysicalVolumeList;
G4std::vector<G4LogicalVolume*> theLogicalVolumeList;
};
source/digits+hits/detector/include/G4SensitiveVolumeList.icc
+6 -6
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4SensitiveVolumeList.icc,v 1.1.8.1.2.1 1999/12/07 20:47:42 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// $Id: G4SensitiveVolumeList.icc,v 1.4 2001/02/08 06:07:11 asaim Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// -----------------------------------------------------------
// Inline functions of GEANT 4 class header file.
@@ -22,14 +22,14 @@
//Get and Set Operations for Has Relationships
inline const G4RWTPtrOrderedVector<G4VPhysicalVolume>& G4SensitiveVolumeList::get_the_G4VPhysicalVolume_list() const { return the_G4VPhysicalVolume_list; }
inline const G4std::vector<G4VPhysicalVolume*>& G4SensitiveVolumeList::get_the_G4VPhysicalVolume_list() const { return the_G4VPhysicalVolume_list; }
inline void G4SensitiveVolumeList::set_the_G4VPhysicalVolume_list(const G4RWTPtrOrderedVector<G4VPhysicalVolume> value) { the_G4VPhysicalVolume_list = value; }
inline void G4SensitiveVolumeList::set_the_G4VPhysicalVolume_list(const G4std::vector<G4VPhysicalVolume*> value) { the_G4VPhysicalVolume_list = value; }
inline const G4RWTPtrOrderedVector<G4LogicalVolume>& G4SensitiveVolumeList::get_the_G4LogicalVolume() const { return the_G4LogicalVolume_list; }
inline const G4std::vector<G4LogicalVolume*>& G4SensitiveVolumeList::get_the_G4LogicalVolume() const { return the_G4LogicalVolume_list; }
inline void G4SensitiveVolumeList::set_the_G4LogicalVolume(const G4RWTPtrOrderedVector<G4LogicalVolume> value) { the_G4LogicalVolume_list = value; }
inline void G4SensitiveVolumeList::set_the_G4LogicalVolume(const G4std::vector<G4LogicalVolume*> value) { the_G4LogicalVolume_list = value; }
source/digits+hits/detector/include/G4VReadOutGeometry.hh
+2 -2
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4VReadOutGeometry.hh,v 1.1.10.1 1999/12/07 20:47:42 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// $Id: G4VReadOutGeometry.hh,v 1.2 1999/12/15 14:49:35 gunter Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// ------------------------------------------------------------
source/digits+hits/detector/include/G4VSensitiveDetector.hh
+6 -5
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4VSensitiveDetector.hh,v 1.2.2.1.2.1 1999/12/07 20:47:43 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// $Id: G4VSensitiveDetector.hh,v 1.5 2001/02/08 06:07:11 asaim Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
#ifndef G4VSensitiveDetector_h
@@ -17,7 +17,8 @@
#include "G4HCofThisEvent.hh"
#include "G4VReadOutGeometry.hh"
#include "G4TouchableHistory.hh"
#include "g4rw/tvordvec.h"
//#include "g4rw/tvordvec.h"
#include "G4CollectionNameVector.hh"
// class description:
//
@@ -77,7 +78,7 @@ class G4VSensitiveDetector
// This is a utility method which returns the hits collection ID of the
// "i"-th collection. "i" is the order (starting with zero) of the collection
// whose name is stored to the collectionName protected vector.
G4RWTValOrderedVector<G4String> collectionName;
G4CollectionNameVector collectionName;
// This protected name vector must be filled at the constructor of the user's
// concrete class for registering the name(s) of hits collection(s) being
// created by this particular sensitive detector.
@@ -115,7 +116,7 @@ class G4VSensitiveDetector
public:
inline G4int GetNumberOfCollections()
{ return collectionName.entries(); }
{ return collectionName.size(); }
inline G4String GetCollectionName(G4int id)
{ return collectionName[id]; }
inline void SetVerboseLevel(G4int vl)
source/digits+hits/detector/src/G4HCtable.cc
+8 -8
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4HCtable.cc,v 1.1.8.1.2.1 1999/12/07 20:47:44 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// $Id: G4HCtable.cc,v 1.4 2001/02/08 06:07:12 asaim Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
#include "G4HCtable.hh"
@@ -17,11 +17,11 @@ G4HCtable::~G4HCtable() {;}
G4int G4HCtable::Registor(G4String SDname,G4String HCname)
{
for(int i=0;i<HClist.entries();i++)
for(int i=0;i<HClist.size();i++)
{ if(HClist[i]==HCname && SDlist[i]==SDname) return -1; }
HClist.insert(HCname);
SDlist.insert(SDname);
return HClist.entries();
HClist.push_back(HCname);
SDlist.push_back(SDname);
return HClist.size();
}
G4int G4HCtable::GetCollectionID(G4String HCname)
@@ -29,7 +29,7 @@ G4int G4HCtable::GetCollectionID(G4String HCname)
G4int i = -1;
if(HCname.index("/")==G4std::string::npos) // HCname only
{
for(G4int j=0;j<HClist.entries();j++)
for(G4int j=0;j<HClist.size();j++)
{
if(HClist[j]==HCname)
{
@@ -40,7 +40,7 @@ G4int G4HCtable::GetCollectionID(G4String HCname)
}
else
{
for(G4int j=0;j<HClist.entries();j++)
for(G4int j=0;j<HClist.size();j++)
{
G4String tgt = SDlist[j];
tgt += "/";
source/digits+hits/detector/src/G4SDManager.cc
+2 -2
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4SDManager.cc,v 1.1.10.1.2.1 1999/12/08 17:33:16 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// $Id: G4SDManager.cc,v 1.2 1999/12/15 14:49:36 gunter Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
#include "G4SDManager.hh"
source/digits+hits/detector/src/G4SDStructure.cc
+24 -24
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4SDStructure.cc,v 1.1.8.1.2.1.2.1 1999/12/08 17:33:17 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// $Id: G4SDStructure.cc,v 1.4 2001/02/08 06:07:12 asaim Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// G4SDStructure
@@ -50,7 +50,7 @@ void G4SDStructure::AddNewDetector(G4VSensitiveDetector*aSD,
{ // Subdirectory not found. Create a new directory.
subD.prepend(pathName);
tgtSDS = new G4SDStructure(subD);
structure.insert( tgtSDS );
structure.push_back( tgtSDS );
}
tgtSDS->AddNewDetector(aSD,treeStructure);
}
@@ -64,25 +64,25 @@ void G4SDStructure::AddNewDetector(G4VSensitiveDetector*aSD,
}
else
{
detector.insert( aSD );
detector.push_back( aSD );
}
}
}
G4SDStructure* G4SDStructure::FindSubDirectory(G4String subD)
{
for( int i=0; i<structure.entries(); i++ )
for( int i=0; i<structure.size(); i++ )
{
if( subD == structure(i)->dirName ) return structure(i);
if( subD == structure[i]->dirName ) return structure[i];
}
return NULL;
}
G4VSensitiveDetector* G4SDStructure::GetSD(G4String aSDName)
{
for( int i=0; i<detector.entries(); i++ )
for( int i=0; i<detector.size(); i++ )
{
G4VSensitiveDetector* tgtSD = detector(i);
G4VSensitiveDetector* tgtSD = detector[i];
if( aSDName == tgtSD->GetName() ) return tgtSD;
}
return NULL;
@@ -115,13 +115,13 @@ void G4SDStructure::Activate(G4String aName, G4bool sensitiveFlag)
}
else if( aPath.isNull() )
{ // Command is ordered for all detectors in this directory.
for( int i=0; i<detector.entries(); i++)
for( int i=0; i<detector.size(); i++)
{
detector(i)->Activate(sensitiveFlag);
detector[i]->Activate(sensitiveFlag);
}
for( int j=0;j<structure.entries(); j++)
for( int j=0;j<structure.size(); j++)
{
structure(j)->Activate(G4String("/"),sensitiveFlag);
structure[j]->Activate(G4String("/"),sensitiveFlag);
}
}
else
@@ -171,14 +171,14 @@ void G4SDStructure::Initialize(G4HCofThisEvent*HCE)
{
int i;
// Broadcast to subdirectories.
for( i=0; i<structure.entries(); i++ )
for( i=0; i<structure.size(); i++ )
{
structure(i)->Initialize(HCE);
structure[i]->Initialize(HCE);
}
// Initialize all detectors in this directory.
for( i=0; i<detector.entries(); i++ )
for( i=0; i<detector.size(); i++ )
{
if(detector(i)->isActive()) detector(i)->Initialize(HCE);
if(detector[i]->isActive()) detector[i]->Initialize(HCE);
}
}
@@ -186,23 +186,23 @@ void G4SDStructure::Terminate(G4HCofThisEvent*HCE)
{
int i;
// Broadcast to subdirectories.
for( i=0; i<structure.entries(); i++ )
for( i=0; i<structure.size(); i++ )
{
structure(i)->Terminate(HCE);
structure[i]->Terminate(HCE);
}
// Initialize all detectors in this directory.
for( i=0; i<detector.entries(); i++ )
for( i=0; i<detector.size(); i++ )
{
if(detector(i)->isActive()) detector(i)->EndOfEvent(HCE);
if(detector[i]->isActive()) detector[i]->EndOfEvent(HCE);
}
}
void G4SDStructure::ListTree()
{
G4cout << pathName << G4endl;
for(int i=0; i<detector.entries(); i++)
for(int i=0; i<detector.size(); i++)
{
G4VSensitiveDetector* sd = detector(i);
G4VSensitiveDetector* sd = detector[i];
G4cout << pathName << sd->GetName();
if( sd->isActive() )
{ G4cout << " *** Active "; }
@@ -210,8 +210,8 @@ void G4SDStructure::ListTree()
{ G4cout << " XXX Inactive "; }
G4cout << G4endl;
}
for(int j=0; j<structure.entries(); j++)
{ structure(j)->ListTree(); }
for(int j=0; j<structure.size(); j++)
{ structure[j]->ListTree(); }
}
source/digits+hits/detector/src/G4SDmessenger.cc
+2 -2
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4SDmessenger.cc,v 1.1.10.1 1999/12/07 20:47:45 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// $Id: G4SDmessenger.cc,v 1.2 1999/12/15 14:49:36 gunter Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// ---------------------------------------------------------------------
source/digits+hits/detector/src/G4SensitiveVolumeList.cc
+8 -8
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4SensitiveVolumeList.cc,v 1.1.10.1 1999/12/07 20:47:45 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// $Id: G4SensitiveVolumeList.cc,v 1.3 2001/02/08 06:07:13 asaim Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// --------------------------------------------------------------
// GEANT 4 class implementation file
@@ -63,18 +63,18 @@
//Other Operations
G4bool G4SensitiveVolumeList::CheckPV(const G4VPhysicalVolume * pvp) const
{
if (thePhysicalVolumeList.entries()==0) return false;
for(int i=0;i<thePhysicalVolumeList.entries();i++)
{ if(thePhysicalVolumeList(i)==pvp) return true; }
if (thePhysicalVolumeList.size()==0) return false;
for(int i=0;i<thePhysicalVolumeList.size();i++)
{ if(thePhysicalVolumeList[i]==pvp) return true; }
return false;
}
G4bool G4SensitiveVolumeList::CheckLV(const G4LogicalVolume * lvp) const
{
if (theLogicalVolumeList.entries()==0) return false;
for(int i=0;i<theLogicalVolumeList.entries();i++)
{ if(theLogicalVolumeList(i)==lvp) return true; }
if (theLogicalVolumeList.size()==0) return false;
for(int i=0;i<theLogicalVolumeList.size();i++)
{ if(theLogicalVolumeList[i]==lvp) return true; }
return false;
}
source/digits+hits/detector/src/G4VReadOutGeometry.cc
+2 -2
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4VReadOutGeometry.cc,v 1.2.6.1 1999/12/07 20:47:45 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// $Id: G4VReadOutGeometry.cc,v 1.3 1999/12/15 14:49:36 gunter Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
#include "G4VReadOutGeometry.hh"
source/digits+hits/detector/src/G4VSensitiveDetector.cc
+2 -2
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4VSensitiveDetector.cc,v 1.1.8.1.2.1 1999/12/07 20:47:45 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// $Id: G4VSensitiveDetector.cc,v 1.3 1999/12/15 14:49:36 gunter Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// G4VSensitiveDetector
#include "G4VSensitiveDetector.hh"
source/digits+hits/digits/include/G4DCofThisEvent.hh
+7 -6
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4DCofThisEvent.hh,v 1.2.2.1.2.1 1999/12/07 20:47:46 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// $Id: G4DCofThisEvent.hh,v 1.5 2001/02/08 06:07:13 asaim Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
#ifndef G4DCofThisEvent_h
@@ -15,7 +15,8 @@
#include "globals.hh"
#include "G4Allocator.hh"
#include "G4VDigiCollection.hh"
#include "g4rw/tpordvec.h"
//#include "g4rw/tpordvec.h"
#include "g4std/vector"
// class description:
//
@@ -40,7 +41,7 @@ class G4DCofThisEvent
void AddDigiCollection(G4int DCID,G4VDigiCollection * aDC);
private:
G4RWTPtrOrderedVector<G4VDigiCollection> * DC;
G4std::vector<G4VDigiCollection*> * DC;
public: // with description
inline G4VDigiCollection* GetDC(G4int i) const
@@ -53,7 +54,7 @@ class G4DCofThisEvent
inline G4int GetNumberOfCollections() const
{
G4int n = 0;
for(int i=0;i<DC->entries();i++)
for(int i=0;i<DC->size();i++)
{
if((*DC)[i]) n++;
}
@@ -64,7 +65,7 @@ class G4DCofThisEvent
public:
inline G4int GetCapacity() const
{
return DC->entries();
return DC->size();
}
};
source/digits+hits/digits/include/G4TDigiCollection.hh
+30 -26
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4TDigiCollection.hh,v 1.5.2.1.2.1 1999/12/07 20:47:46 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// $Id: G4TDigiCollection.hh,v 1.8 2001/02/08 06:07:13 asaim Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
#ifndef G4TDigiCollection_h
@@ -15,7 +15,8 @@
#include "G4VDigiCollection.hh"
#include "G4Allocator.hh"
#include "globals.hh"
#include "g4rw/tpordvec.h"
//#include "g4rw/tpordvec.h"
#include "g4std/vector"
// class description:
//
@@ -62,25 +63,25 @@ template <class T> class G4TDigiCollection : public G4DigiCollection
public: // with description
inline T* operator[](size_t i) const
{ return (*((G4RWTPtrOrderedVector<T>*)theCollection))[i]; }
{ return (*((G4std::vector<T*>*)theCollection))[i]; }
// Returns a pointer to a concrete digi object.
inline G4RWTPtrOrderedVector<T>* GetVector() const
{ return (G4RWTPtrOrderedVector<T>*)theCollection; }
inline G4std::vector<T*>* GetVector() const
{ return (G4std::vector<T*>*)theCollection; }
// Returns a collection vector.
inline int insert(T* aHit)
{
G4RWTPtrOrderedVector<T>*theDigiCollection
= (G4RWTPtrOrderedVector<T>*)theCollection;
theDigiCollection->insert(aHit);
return theDigiCollection->entries();
G4std::vector<T*>*theDigiCollection
= (G4std::vector<T*>*)theCollection;
theDigiCollection->push_back(aHit);
return theDigiCollection->size();
}
// Insert a digi object. Total number of digi objects stored in this
// collection is returned.
inline int entries() const
{
G4RWTPtrOrderedVector<T>*theDigiCollection
= (G4RWTPtrOrderedVector<T>*)theCollection;
return theDigiCollection->entries();
G4std::vector<T*>*theDigiCollection
= (G4std::vector<T*>*)theCollection;
return theDigiCollection->size();
}
// Returns the number of digi objcets stored in this collection.
};
@@ -99,24 +100,27 @@ template <class T> inline void G4TDigiCollection<T>::operator delete(void* aDC)
template <class T> G4TDigiCollection<T>::G4TDigiCollection()
{
G4RWTPtrOrderedVector<T> * theDigiCollection
= new G4RWTPtrOrderedVector<T>;
G4std::vector<T*> * theDigiCollection
= new G4std::vector<T*>;
theCollection = (void*)theDigiCollection;
}
template <class T> G4TDigiCollection<T>::G4TDigiCollection(G4String detName,G4String colNam)
: G4DigiCollection(detName,colNam)
{
G4RWTPtrOrderedVector<T> * theDigiCollection
= new G4RWTPtrOrderedVector<T>;
G4std::vector<T*> * theDigiCollection
= new G4std::vector<T*>;
theCollection = (void*)theDigiCollection;
}
template <class T> G4TDigiCollection<T>::~G4TDigiCollection()
{
G4RWTPtrOrderedVector<T> * theDigiCollection
= (G4RWTPtrOrderedVector<T>*)theCollection;
theDigiCollection->clearAndDestroy();
G4std::vector<T*> * theDigiCollection
= (G4std::vector<T*>*)theCollection;
//theDigiCollection->clearAndDestroy();
for(int i=0;i<theDigiCollection->size();i++)
{ delete (*theDigiCollection)[i]; }
theDigiCollection->clear();
delete theDigiCollection;
}
@@ -125,18 +129,18 @@ template <class T> int G4TDigiCollection<T>::operator==(const G4TDigiCollection<
template <class T> void G4TDigiCollection<T>::DrawAllDigi()
{
G4RWTPtrOrderedVector<T> * theDigiCollection
= (G4RWTPtrOrderedVector<T>*)theCollection;
int n = theDigiCollection->entries();
G4std::vector<T*> * theDigiCollection
= (G4std::vector<T*>*)theCollection;
int n = theDigiCollection->size();
for(int i=0;i<n;i++)
{ (*theDigiCollection)[i]->Draw(); }
}
template <class T> void G4TDigiCollection<T>::PrintAllDigi()
{
G4RWTPtrOrderedVector<T> * theDigiCollection
= (G4RWTPtrOrderedVector<T>*)theCollection;
int n = theDigiCollection->entries();
G4std::vector<T*> * theDigiCollection
= (G4std::vector<T*>*)theCollection;
int n = theDigiCollection->size();
for(int i=0;i<n;i++)
{ (*theDigiCollection)[i]->Print(); }
}
source/digits+hits/digits/include/G4VDigi.hh
+2 -2
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4VDigi.hh,v 1.4.4.1 1999/12/07 20:47:46 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// $Id: G4VDigi.hh,v 1.5 1999/12/15 14:49:36 gunter Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
#ifndef G4VDigi_h
source/digits+hits/digits/include/G4VDigiCollection.hh
+2 -2
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4VDigiCollection.hh,v 1.4.4.1 1999/12/07 20:47:46 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// $Id: G4VDigiCollection.hh,v 1.5 1999/12/15 14:49:36 gunter Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
#ifndef G4VDigiCollection_h
source/digits+hits/digits/src/G4DCofThisEvent.cc
+10 -7
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4DCofThisEvent.cc,v 1.1.8.1.2.1 1999/12/07 20:47:47 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// $Id: G4DCofThisEvent.cc,v 1.4 2001/02/08 06:07:14 asaim Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
#include "G4DCofThisEvent.hh"
@@ -15,27 +15,30 @@ G4Allocator<G4DCofThisEvent> anDCoTHAllocator;
G4DCofThisEvent::G4DCofThisEvent()
{
DC = new G4RWTPtrOrderedVector<G4VDigiCollection>;
DC = new G4std::vector<G4VDigiCollection*>;
}
G4DCofThisEvent::G4DCofThisEvent(G4int cap)
{
DC = new G4RWTPtrOrderedVector<G4VDigiCollection>;
DC = new G4std::vector<G4VDigiCollection*>;
for(int i=0;i<cap;i++)
{
DC->insert((G4VDigiCollection*)NULL);
DC->push_back((G4VDigiCollection*)NULL);
}
}
G4DCofThisEvent::~G4DCofThisEvent()
{
DC->clearAndDestroy();
//DC->clearAndDestroy();
for(G4int i=0;i<DC->size();i++)
{ delete (*DC)[i]; }
DC->clear();
delete DC;
}
void G4DCofThisEvent::AddDigiCollection(G4int DCID,G4VDigiCollection * aDC)
{
if(DCID>=0 && DCID<DC->entries())
if(DCID>=0 && DCID<DC->size())
{ (*DC)[DCID] = aDC; }
}
source/digits+hits/digits/src/G4TDigiCollection.cc
+2 -2
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4TDigiCollection.cc,v 1.1.10.1 1999/12/07 20:47:47 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// $Id: G4TDigiCollection.cc,v 1.2 1999/12/15 14:49:37 gunter Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
#include "G4TDigiCollection.hh"
source/digits+hits/digits/src/G4VDigi.cc
+2 -2
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4VDigi.cc,v 1.3.4.1 1999/12/07 20:47:47 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// $Id: G4VDigi.cc,v 1.4 1999/12/15 14:49:37 gunter Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// G4VDigi
source/digits+hits/digits/src/G4VDigiCollection.cc
+2 -2
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4VDigiCollection.cc,v 1.3.4.1 1999/12/07 20:47:47 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// $Id: G4VDigiCollection.cc,v 1.4 1999/12/15 14:49:37 gunter Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// G4VDigiCollection
source/digits+hits/hits/include/G4HCofThisEvent.hh
+7 -6
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4HCofThisEvent.hh,v 1.2.2.1.2.1 1999/12/07 20:47:47 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// $Id: G4HCofThisEvent.hh,v 1.5 2001/02/08 06:07:14 asaim Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
#ifndef G4HCofThisEvent_h
@@ -15,7 +15,8 @@
#include "globals.hh"
#include "G4Allocator.hh"
#include "G4VHitsCollection.hh"
#include "g4rw/tpordvec.h"
//#include "g4rw/tpordvec.h"
#include "g4std/vector"
// class description:
//
@@ -40,7 +41,7 @@ class G4HCofThisEvent
void AddHitsCollection(G4int HCID,G4VHitsCollection * aHC);
private:
G4RWTPtrOrderedVector<G4VHitsCollection> * HC;
G4std::vector<G4VHitsCollection*> * HC;
public: // with description
inline G4VHitsCollection* GetHC(G4int i)
@@ -53,7 +54,7 @@ class G4HCofThisEvent
inline G4int GetNumberOfCollections()
{
G4int n = 0;
for(int i=0;i<HC->entries();i++)
for(int i=0;i<HC->size();i++)
{
if((*HC)[i]) n++;
}
@@ -64,7 +65,7 @@ class G4HCofThisEvent
public:
inline G4int GetCapacity()
{
return HC->entries();
return HC->size();
}
};
source/digits+hits/hits/include/G4THitsCollection.hh
+30 -26
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4THitsCollection.hh,v 1.4.2.1.2.1 1999/12/07 20:47:47 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// $Id: G4THitsCollection.hh,v 1.7 2001/02/08 06:07:14 asaim Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
#ifndef G4THitsCollection_h
@@ -15,7 +15,8 @@
#include "G4VHitsCollection.hh"
#include "G4Allocator.hh"
#include "globals.hh"
#include "g4rw/tpordvec.h"
//#include "g4rw/tpordvec.h"
#include "g4std/vector"
// class description:
//
@@ -62,25 +63,25 @@ template <class T> class G4THitsCollection : public G4HitsCollection
public: // with description
inline T* operator[](size_t i) const
{ return (*((G4RWTPtrOrderedVector<T>*)theCollection))[i]; }
{ return (*((G4std::vector<T*>*)theCollection))[i]; }
// Returns a pointer to a concrete hit object.
inline G4RWTPtrOrderedVector<T>* GetVector() const
{ return (G4RWTPtrOrderedVector<T>*)theCollection; }
inline G4std::vector<T*>* GetVector() const
{ return (G4std::vector<T*>*)theCollection; }
// Returns a collection vector.
inline int insert(T* aHit)
{
G4RWTPtrOrderedVector<T>*theHitsCollection
= (G4RWTPtrOrderedVector<T>*)theCollection;
theHitsCollection->insert(aHit);
return theHitsCollection->entries();
G4std::vector<T*>*theHitsCollection
= (G4std::vector<T*>*)theCollection;
theHitsCollection->push_back(aHit);
return theHitsCollection->size();
}
// Insert a hit object. Total number of hit objects stored in this
// collection is returned.
inline int entries() const
{
G4RWTPtrOrderedVector<T>*theHitsCollection
= (G4RWTPtrOrderedVector<T>*)theCollection;
return theHitsCollection->entries();
G4std::vector<T*>*theHitsCollection
= (G4std::vector<T*>*)theCollection;
return theHitsCollection->size();
}
// Returns the number of hit objects stored in this collection
@@ -100,24 +101,27 @@ template <class T> inline void G4THitsCollection<T>::operator delete(void* anHC)
template <class T> G4THitsCollection<T>::G4THitsCollection()
{
G4RWTPtrOrderedVector<T> * theHitsCollection
= new G4RWTPtrOrderedVector<T>;
G4std::vector<T*> * theHitsCollection
= new G4std::vector<T*>;
theCollection = (void*)theHitsCollection;
}
template <class T> G4THitsCollection<T>::G4THitsCollection(G4String detName,G4String colNam)
: G4HitsCollection(detName,colNam)
{
G4RWTPtrOrderedVector<T> * theHitsCollection
= new G4RWTPtrOrderedVector<T>;
G4std::vector<T*> * theHitsCollection
= new G4std::vector<T*>;
theCollection = (void*)theHitsCollection;
}
template <class T> G4THitsCollection<T>::~G4THitsCollection()
{
G4RWTPtrOrderedVector<T> * theHitsCollection
= (G4RWTPtrOrderedVector<T>*)theCollection;
theHitsCollection->clearAndDestroy();
G4std::vector<T*> * theHitsCollection
= (G4std::vector<T*>*)theCollection;
//theHitsCollection->clearAndDestroy();
for(int i=0;i<theHitsCollection->size();i++)
{ delete (*theHitsCollection)[i]; }
theHitsCollection->clear();
delete theHitsCollection;
}
@@ -126,18 +130,18 @@ template <class T> int G4THitsCollection<T>::operator==(const G4THitsCollection<
template <class T> void G4THitsCollection<T>::DrawAllHits()
{
G4RWTPtrOrderedVector<T> * theHitsCollection
= (G4RWTPtrOrderedVector<T>*)theCollection;
int n = theHitsCollection->entries();
G4std::vector<T*> * theHitsCollection
= (G4std::vector<T*>*)theCollection;
int n = theHitsCollection->size();
for(int i=0;i<n;i++)
{ (*theHitsCollection)[i]->Draw(); }
}
template <class T> void G4THitsCollection<T>::PrintAllHits()
{
G4RWTPtrOrderedVector<T> * theHitsCollection
= (G4RWTPtrOrderedVector<T>*)theCollection;
int n = theHitsCollection->entries();
G4std::vector<T*> * theHitsCollection
= (G4std::vector<T*>*)theCollection;
int n = theHitsCollection->size();
for(int i=0;i<n;i++)
{ (*theHitsCollection)[i]->Print(); }
}
source/digits+hits/hits/include/G4VHit.hh
+2 -2
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4VHit.hh,v 1.3.4.1 1999/12/07 20:47:48 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// $Id: G4VHit.hh,v 1.4 1999/12/15 14:49:37 gunter Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
#ifndef G4VHit_h
source/digits+hits/hits/include/G4VHitsCollection.hh
+2 -2
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4VHitsCollection.hh,v 1.3.4.1 1999/12/07 20:47:48 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// $Id: G4VHitsCollection.hh,v 1.4 1999/12/15 14:49:37 gunter Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
#ifndef G4VHitsCollection_h
source/digits+hits/hits/src/G4HCofThisEvent.cc
+10 -7
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4HCofThisEvent.cc,v 1.1.8.1.2.1 1999/12/07 20:47:48 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// $Id: G4HCofThisEvent.cc,v 1.4 2001/02/08 06:07:15 asaim Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
#include "G4HCofThisEvent.hh"
@@ -15,27 +15,30 @@ G4Allocator<G4HCofThisEvent> anHCoTHAllocator;
G4HCofThisEvent::G4HCofThisEvent()
{
HC = new G4RWTPtrOrderedVector<G4VHitsCollection>;
HC = new G4std::vector<G4VHitsCollection*>;
}
G4HCofThisEvent::G4HCofThisEvent(G4int cap)
{
HC = new G4RWTPtrOrderedVector<G4VHitsCollection>;
HC = new G4std::vector<G4VHitsCollection*>;
for(int i=0;i<cap;i++)
{
HC->insert((G4VHitsCollection*)NULL);
HC->push_back((G4VHitsCollection*)NULL);
}
}
G4HCofThisEvent::~G4HCofThisEvent()
{
HC->clearAndDestroy();
//HC->clearAndDestroy();
for(G4int i=0;i<HC->size();i++)
{ delete (*HC)[i]; }
HC->clear();
delete HC;
}
void G4HCofThisEvent::AddHitsCollection(G4int HCID,G4VHitsCollection * aHC)
{
if(HCID>=0 && HCID<HC->entries())
if(HCID>=0 && HCID<HC->size())
{ (*HC)[HCID] = aHC; }
}
source/digits+hits/hits/src/G4THitsCollection.cc
+2 -2
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4THitsCollection.cc,v 1.1.10.1 1999/12/07 20:47:48 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// $Id: G4THitsCollection.cc,v 1.2 1999/12/15 14:49:38 gunter Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
#include "G4THitsCollection.hh"
source/digits+hits/hits/src/G4VHit.cc
+2 -2
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4VHit.cc,v 1.1.10.1 1999/12/07 20:47:48 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// $Id: G4VHit.cc,v 1.2 1999/12/15 14:49:38 gunter Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// G4VHit
source/digits+hits/hits/src/G4VHitsCollection.cc
+2 -2
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4VHitsCollection.cc,v 1.1.10.1 1999/12/07 20:47:49 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// $Id: G4VHitsCollection.cc,v 1.2 1999/12/15 14:49:38 gunter Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
// G4VHitsCollection
source/event/History
+33 -1
View File
@@ -1,4 +1,4 @@
$Id: History,v 1.16 2000/11/20 15:39:53 gcosmo Exp $
$Id: History,v 1.21 2001/02/08 06:13:53 asaim Exp $
-------------------------------------------------------------------
=========================================================
@@ -17,6 +17,38 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
Feb 8 2001, M.Asai (event-V03-00-03)
- Migration to STL vector classes
affected files :
./event/include/G4HEPEvtInterface.hh
./event/include/G4PrimaryParticle.hh
./event/include/G4TrajectoryContainer.hh
./event/src/G4EventManager.cc
./event/src/G4GeneralParticleSource.cc
./event/src/G4HEPEvtInterface.cc
./event/src/G4PrimaryParticle.cc
./event/src/G4PrimaryTransformer.cc
Feb 7 2001, M.Asai (event-V03-00-02)
- Add proper time to G4PrimaryParticle
Feb 7 2001, M.Asai (event-V03-00-01)
- Fix syntax errors in G4GeneralSourceParticle.cc
Feb 5 2001, M.Asai (event-V03-00-00)
Jan 26 2001, F. Lei
- bug fixing in G4GeneralSourceParticle.cc
replace:
posphi = acos(tx/sin(posthe));
with:
if (posthe != 0. && posthe != pi)
posphi = acos(tx/sin(posthe));
else
posphi = 0.0;
endif
Nov 20 2000, G.Cosmo (event-V02-00-04)
- Removed data-logs from test directory.
source/event/include/G4ClassificationOfNewTrack.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4ClassificationOfNewTrack.hh,v 1.3 1999/12/15 14:49:38 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
//
source/event/include/G4EvManMessenger.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4EvManMessenger.hh,v 1.3 1999/12/15 14:49:38 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
#ifndef G4EvManMessenger_h
source/event/include/G4Event.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4Event.hh,v 1.3 1999/12/15 14:49:38 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
#ifndef G4Event_h
source/event/include/G4EventManager.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4EventManager.hh,v 1.5 2000/01/12 01:29:50 asaim Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
//
source/event/include/G4HEPEvtInterface.hh
+4 -4
View File
@@ -5,15 +5,15 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4HEPEvtInterface.hh,v 1.4 1999/12/15 14:49:38 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// $Id: G4HEPEvtInterface.hh,v 1.5 2001/02/08 06:07:16 asaim Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
#ifndef G4HEPEvtInterface_h
#define G4HEPEvtInterface_h 1
#include "g4std/fstream"
#include "g4rw/tpordvec.h"
#include "g4std/vector"
#include "globals.hh"
#include "G4VPrimaryGenerator.hh"
#include "G4HEPEvtParticle.hh"
@@ -70,7 +70,7 @@ class G4HEPEvtInterface:public G4VPrimaryGenerator
private:
G4String fileName;
G4std::ifstream inputFile;
G4RWTPtrOrderedVector<G4HEPEvtParticle> HPlist;
G4std::vector<G4HEPEvtParticle*> HPlist;
};
#endif
source/event/include/G4HEPEvtParticle.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4HEPEvtParticle.hh,v 1.3 1999/12/15 14:49:38 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
//
source/event/include/G4ParticleGun.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4ParticleGun.hh,v 1.4 2000/10/18 12:41:21 kurasige Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
#ifndef G4ParticleGun_h
source/event/include/G4ParticleGunMessenger.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4ParticleGunMessenger.hh,v 1.5 2000/10/19 13:29:18 kurasige Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
//
source/event/include/G4PrimaryParticle.hh
+5 -2
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4PrimaryParticle.hh,v 1.6 2000/10/19 15:19:36 asaim Exp $
// GEANT4 tag $Name: geant4-03-00 $
// $Id: G4PrimaryParticle.hh,v 1.8 2001/02/08 06:07:16 asaim Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
//
@@ -88,6 +88,7 @@ class G4PrimaryParticle
G4double polY;
G4double polZ;
G4double Weight0;
G4double properTime;
public: // with description
// followings are get methods available.
@@ -124,6 +125,8 @@ class G4PrimaryParticle
inline G4double GetPolZ() const { return polZ; }
inline G4double GetWeight() const { return Weight0; }
inline void SetWeight(G4double w) { Weight0 = w; }
inline void SetProperTime(G4double t) { properTime = t; }
inline G4double GetProperTime() const { return properTime; }
public: // with description
// Followings are available Set methods.
source/event/include/G4PrimaryTransformer.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PrimaryTransformer.hh,v 1.4 2000/10/19 15:19:36 asaim Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
#ifndef G4PromaryTransformer_h
source/event/include/G4PrimaryVertex.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PrimaryVertex.hh,v 1.5 2000/10/19 15:19:36 asaim Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
//
source/event/include/G4StackManager.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4StackManager.hh,v 1.5 2000/01/26 06:42:14 asaim Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
//
source/event/include/G4StackedTrack.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4StackedTrack.hh,v 1.4 2000/01/26 06:42:15 asaim Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
//
// Last Modification : 02/Feb/96 M.Asai
source/event/include/G4StackingMessenger.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4StackingMessenger.hh,v 1.3 1999/12/15 14:49:39 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
#ifndef G4StackingMessenger_h
source/event/include/G4TrackStack.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4TrackStack.hh,v 1.3 1999/12/15 14:49:39 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
//
// Last Modification : 09/Dec/96 M.Asai
source/event/include/G4TrajectoryContainer.hh
+20 -4
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4TrajectoryContainer.hh,v 1.5 1999/12/15 14:49:39 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// $Id: G4TrajectoryContainer.hh,v 1.6 2001/02/08 06:07:16 asaim Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
//
// G4TrajectoryContainer
@@ -17,15 +17,31 @@
#include "G4VTrajectory.hh"
// G4RWTPtrOrderedVector
#include "g4rw/tpordvec.h"
//#include "g4rw/tpordvec.h"
// class description:
//
// This is a container of G4VTrajectory objects and the object of this
// container will be associated to G4Event object.
typedef G4RWTPtrOrderedVector<G4VTrajectory> G4TrajectoryContainer;
//typedef G4RWTPtrOrderedVector<G4VTrajectory> G4TrajectoryContainer;
class G4TrajectoryContainer : public G4std::vector<G4VTrajectory*>
{
public:
G4TrajectoryContainer() {;}
~G4TrajectoryContainer() {;}
public:
inline G4int entries() { return size(); }
inline G4bool insert(G4VTrajectory* p) { push_back(p); return true; }
inline void clearAndDestroy()
{
for(int i=0;i<size();i++)
{ delete (*this)[i]; }
clear();
}
};
#endif
source/event/include/G4UserEventAction.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4UserEventAction.hh,v 1.4 1999/12/15 14:49:39 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
//
//
source/event/include/G4UserStackingAction.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4UserStackingAction.hh,v 1.4 1999/12/15 14:49:39 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
#ifndef G4UserStackingAction_h
source/event/include/G4VPrimaryGenerator.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4VPrimaryGenerator.hh,v 1.3 1999/12/15 14:49:39 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
#ifndef G4VPrimaryGenerator_h
source/event/include/eventgendefs.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: eventgendefs.hh,v 1.2 1999/12/15 14:49:40 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
#ifndef EventGenerator_DEBUG
#define EventGenerator_DEBUG
source/event/include/evmandefs.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: evmandefs.hh,v 1.2 1999/12/15 14:49:40 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
///#define G4EVENTMANAGER_DEBUG 1
source/event/include/trajectoryControl.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: trajectoryControl.hh,v 1.2 1999/12/15 14:49:40 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
////#define G4_STORE_TRAJECTORY 1
source/event/src/G4EvManMessenger.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4EvManMessenger.cc,v 1.2 1999/12/15 14:49:40 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
// --------------------------------------------------------------------
source/event/src/G4Event.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4Event.cc,v 1.2 1999/12/15 14:49:40 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
// G4Event
source/event/src/G4EventManager.cc
+10 -4
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4EventManager.cc,v 1.5 2000/01/26 06:42:15 asaim Exp $
// GEANT4 tag $Name: geant4-03-00 $
// $Id: G4EventManager.cc,v 1.6 2001/02/08 06:07:16 asaim Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
//
//
@@ -184,7 +184,13 @@ void G4EventManager::ProcessOneEvent(G4Event* anEvent)
G4cout << "Illeagal TrackStatus returned from G4TrackingManager!"
<< G4endl;
case fKillTrackAndSecondaries:
if( secondaries ) secondaries->clearAndDestroy();
//if( secondaries ) secondaries->clearAndDestroy();
if( secondaries )
{
for(G4int i=0;i<secondaries->size();i++)
{ delete (*secondaries)[i]; }
secondaries->clear();
}
delete track;
break;
}
@@ -217,7 +223,7 @@ void G4EventManager::StackTracks(G4TrackVector *trackVector)
if( trackVector )
{
size_t n_passedTrack = trackVector->entries();
size_t n_passedTrack = trackVector->size();
if( n_passedTrack == 0 ) return;
for( size_t i = 0; i < n_passedTrack; i++ )
{
source/event/src/G4GeneralParticleSource.cc
+16 -4
View File
@@ -21,6 +21,17 @@
// CHANGE HISTORY
// --------------
//
// 26-01-2001, F. Lei
// replace:
// posphi = acos(tx/sin(posthe));
//
// with:
// if (posthe != 0. && posthe != pi)
// { posphi = acos(tx/sin(posthe)); }
// else
// { posphi = 0.0;}
// endif
//
// 10-Nov-2000, F. Lei
// some bug fixing:
// i) dclared ' G4int count' in all ****Interpolation functions
@@ -28,7 +39,7 @@
// as default.
//
// 09-Nov-2000, F Lei
// Changed to a fast mplementation for generating iso and cos angular directions
// Changed to a fast implementation for generating iso and cos angular directions
//
// Version 1.1, 18 October 2000, Modified to inherit from G4VPrimaryGenerator.
// New name at the request of M. Asai.
@@ -261,7 +272,6 @@ void G4GeneralParticleSource::ConfineSourceToVolume(G4String Vname)
found = tempPV->GetName() == theRequiredVolumeName;
if(verbosityLevel == 2)
G4cout << i << " " << " " << tempPV->GetName() << " " << theRequiredVolumeName << " " << found << G4endl;
if (!found)
{i++;}
}
@@ -298,7 +308,6 @@ void G4GeneralParticleSource::GeneratePointsInPlane()
G4double expression;
G4ThreeVector RandPos;
G4double tempx, tempy, tempz;
z = 0.;
if(SourcePosType != "Plane" && verbosityLevel >= 1)
@@ -1112,7 +1121,10 @@ void G4GeneralParticleSource::GenerateIsotropicFlux()
tz = tz/tt;
// G4cout << "unit position " << tx << " " << ty << " " << tz << G4endl;
posthe = acos(tz);
posphi = acos(tx/sin(posthe));
if (posthe != 0. && posthe != pi)
{ posphi = acos(tx/sin(posthe)); }
else
{ posphi = 0.0;}
// G4cout << "Posthe and posphi " << posthe << " " << posphi << G4endl;
G4double finx, finy, finz;
finx = (px*cos(posthe)*cos(posphi)) - (py*sin(posphi)) + (pz*sin(posthe)*cos(posphi));
source/event/src/G4HEPEvtInterface.cc
+19 -16
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4HEPEvtInterface.cc,v 1.3 1999/12/15 14:49:40 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// $Id: G4HEPEvtInterface.cc,v 1.4 2001/02/08 06:07:17 asaim Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
//
// --------------------------------------------------------------------
@@ -75,28 +75,28 @@ void G4HEPEvtInterface::GeneratePrimaryVertex(G4Event* evt)
= new G4HEPEvtParticle( particle, ISTHEP, JDAHEP1, JDAHEP2 );
// Store
HPlist.insert( hepParticle );
HPlist.push_back( hepParticle );
}
// check if there is at least one particle
if( HPlist.entries() == 0 ) return;
if( HPlist.size() == 0 ) return;
// make connection between daughter particles decayed from
// the same mother
for( int i=0; i<HPlist.entries(); i++ )
for( int i=0; i<HPlist.size(); i++ )
{
if( HPlist(i)->GetJDAHEP1() > 0 ) // it has daughters
if( HPlist[i]->GetJDAHEP1() > 0 ) // it has daughters
{
int jda1 = HPlist(i)->GetJDAHEP1()-1; // FORTRAN index starts from 1
int jda2 = HPlist(i)->GetJDAHEP2()-1; // but C++ starts from 0.
G4PrimaryParticle* mother = HPlist(i)->GetTheParticle();
int jda1 = HPlist[i]->GetJDAHEP1()-1; // FORTRAN index starts from 1
int jda2 = HPlist[i]->GetJDAHEP2()-1; // but C++ starts from 0.
G4PrimaryParticle* mother = HPlist[i]->GetTheParticle();
for( int j=jda1; j<=jda2; j++ )
{
G4PrimaryParticle* daughter = HPlist(j)->GetTheParticle();
if(HPlist(j)->GetISTHEP()>0)
G4PrimaryParticle* daughter = HPlist[j]->GetTheParticle();
if(HPlist[j]->GetISTHEP()>0)
{
mother->SetDaughter( daughter );
HPlist(j)->Done();
HPlist[j]->Done();
}
}
}
@@ -110,18 +110,21 @@ void G4HEPEvtInterface::GeneratePrimaryVertex(G4Event* evt)
G4PrimaryVertex* vertex = new G4PrimaryVertex(x0,y0,z0,t0);
// put initial particles to the vertex
for( int ii=0; ii<HPlist.entries(); ii++ )
for( int ii=0; ii<HPlist.size(); ii++ )
{
if( HPlist(ii)->GetISTHEP() > 0 ) // ISTHEP of daughters had been
if( HPlist[ii]->GetISTHEP() > 0 ) // ISTHEP of daughters had been
// set to negative
{
G4PrimaryParticle* initialParticle = HPlist(ii)->GetTheParticle();
G4PrimaryParticle* initialParticle = HPlist[ii]->GetTheParticle();
vertex->SetPrimary( initialParticle );
}
}
// clear G4HEPEvtParticles
HPlist.clearAndDestroy();
//HPlist.clearAndDestroy();
for(G4int iii=0;iii<HPlist.size();iii++)
{ delete HPlist[iii]; }
HPlist.clear();
// Put the vertex to G4Event object
evt->AddPrimaryVertex( vertex );
source/event/src/G4HEPEvtParticle.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4HEPEvtParticle.cc,v 1.2 1999/12/15 14:49:40 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
//
source/event/src/G4ParticleGun.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4ParticleGun.cc,v 1.3 2000/10/18 12:41:25 kurasige Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
// G4ParticleGun
source/event/src/G4ParticleGunMessenger.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4ParticleGunMessenger.cc,v 1.4 2000/10/19 13:29:38 kurasige Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
#include "G4ParticleGunMessenger.hh"
source/event/src/G4PrimaryParticle.cc
+9 -7
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4PrimaryParticle.cc,v 1.3 2000/10/19 15:19:37 asaim Exp $
// GEANT4 tag $Name: geant4-03-00 $
// $Id: G4PrimaryParticle.cc,v 1.5 2001/02/08 06:07:17 asaim Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
#include "G4PrimaryParticle.hh"
@@ -19,33 +19,33 @@ G4Allocator<G4PrimaryParticle> aPrimaryParticleAllocator;
G4PrimaryParticle::G4PrimaryParticle()
:PDGcode(0),G4code(NULL),Px(0.),Py(0.),Pz(0.),
nextParticle(NULL),daughterParticle(NULL),trackID(-1),
mass(0.),polX(0.),polY(0.),polZ(0.),Weight0(1.0)
mass(0.),polX(0.),polY(0.),polZ(0.),Weight0(1.0),properTime(0.0)
{;}
G4PrimaryParticle::G4PrimaryParticle(G4int Pcode)
:PDGcode(Pcode),Px(0.),Py(0.),Pz(0.),
nextParticle(NULL),daughterParticle(NULL),trackID(-1),
mass(0.),polX(0.),polY(0.),polZ(0.),Weight0(1.0)
mass(0.),polX(0.),polY(0.),polZ(0.),Weight0(1.0),properTime(0.0)
{ G4code = G4ParticleTable::GetParticleTable()->FindParticle(Pcode); }
G4PrimaryParticle::G4PrimaryParticle(G4int Pcode,
G4double px,G4double py,G4double pz)
:PDGcode(Pcode),Px(px),Py(py),Pz(pz),
nextParticle(NULL),daughterParticle(NULL),trackID(-1),
mass(0.),polX(0.),polY(0.),polZ(0.),Weight0(1.0)
mass(0.),polX(0.),polY(0.),polZ(0.),Weight0(1.0),properTime(0.0)
{ G4code = G4ParticleTable::GetParticleTable()->FindParticle(Pcode); }
G4PrimaryParticle::G4PrimaryParticle(G4ParticleDefinition* Gcode)
:G4code(Gcode),Px(0.),Py(0.),Pz(0.),
nextParticle(NULL),daughterParticle(NULL),trackID(-1),
mass(0.),polX(0.),polY(0.),polZ(0.),Weight0(1.0)
mass(0.),polX(0.),polY(0.),polZ(0.),Weight0(1.0),properTime(0.0)
{ PDGcode = Gcode->GetPDGEncoding(); }
G4PrimaryParticle::G4PrimaryParticle(G4ParticleDefinition* Gcode,
G4double px,G4double py,G4double pz)
:G4code(Gcode),Px(px),Py(py),Pz(pz),
nextParticle(NULL),daughterParticle(NULL),trackID(-1),
mass(0.),polX(0.),polY(0.),polZ(0.),Weight0(1.0)
mass(0.),polX(0.),polY(0.),polZ(0.),Weight0(1.0),properTime(0.0)
{ PDGcode = Gcode->GetPDGEncoding(); }
G4PrimaryParticle::~G4PrimaryParticle()
@@ -87,6 +87,8 @@ void G4PrimaryParticle::Print() const
G4cout << " Polarization ( " << polX << ", " << polY << ", "
<< polZ << " )" << G4endl;
G4cout << " Weight : " << Weight0 << G4endl;
if(properTime>0.0)
{ G4cout << " PreAssigned proper decay time : " << properTime/ns << " (nsec)" << G4endl; }
if(daughterParticle != NULL)
{
G4cout << ">>>> Daughters" << G4endl;
source/event/src/G4PrimaryTransformer.cc
+9 -4
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4PrimaryTransformer.cc,v 1.5 2000/10/19 15:19:37 asaim Exp $
// GEANT4 tag $Name: geant4-03-00 $
// $Id: G4PrimaryTransformer.cc,v 1.8 2001/02/09 00:11:31 asaim Exp $
// GEANT4 tag $Name: geant4-03-01 $
//
#include "G4PrimaryTransformer.hh"
@@ -30,7 +30,10 @@ G4PrimaryTransformer::~G4PrimaryTransformer()
G4TrackVector* G4PrimaryTransformer::GimmePrimaries(G4Event* anEvent)
{
TV.clearAndDestroy();
//TV.clearAndDestroy();
for( int ii=0; ii<TV.size();ii++)
{ delete TV[ii]; }
TV.clear();
G4int n_vertex = anEvent->GetNumberOfPrimaryVertex();
if(n_vertex==0) return NULL;
for( int i=0; i<n_vertex; i++ )
@@ -105,6 +108,8 @@ void G4PrimaryTransformer::GenerateSingleTrack
DP->SetPolarization(primaryParticle->GetPolX(),
primaryParticle->GetPolY(),
primaryParticle->GetPolZ());
if(primaryParticle->GetProperTime()>0.0)
{ DP->SetPreAssignedDecayProperTime(primaryParticle->GetProperTime()); }
// Set Charge
if (abs(primaryParticle->GetCharge()-DP->GetCharge())>eplus) {
DP->SetCharge(primaryParticle->GetCharge());
@@ -118,7 +123,7 @@ void G4PrimaryTransformer::GenerateSingleTrack
// Set weight ( vertex weight * particle weight )
track->SetWeight(wv*(primaryParticle->GetWeight()));
// Store it to G4TrackVector
TV.insert( track );
TV.push_back( track );
}
}
source/event/src/G4PrimaryVertex.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4PrimaryVertex.cc,v 1.3 2000/10/19 15:19:37 asaim Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
#include "G4PrimaryVertex.hh"
source/event/src/G4StackManager.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4StackManager.cc,v 1.3 2000/01/26 06:42:16 asaim Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
//
// Last Modification : 09/Dec/96 M.Asai
source/event/src/G4StackedTrack.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4StackedTrack.cc,v 1.3 2000/01/26 06:42:16 asaim Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
//
// Last Modification : 02/Feb/96 M.Asai
source/event/src/G4StackingMessenger.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4StackingMessenger.cc,v 1.2 1999/12/15 14:49:41 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
// --------------------------------------------------------------------
source/event/src/G4TrackStack.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4TrackStack.cc,v 1.2 1999/12/15 14:49:41 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
//
// Last Modification : 09/Dec/96 M.Asai
source/event/src/G4UserEventAction.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4UserEventAction.cc,v 1.3 1999/12/15 14:49:41 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
#include "G4UserEventAction.hh"
source/event/src/G4UserStackingAction.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4UserStackingAction.cc,v 1.3 1999/12/15 14:49:42 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
#include "G4UserStackingAction.hh"
source/event/src/G4VPrimaryGenerator.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4VPrimaryGenerator.cc,v 1.2 1999/12/15 14:49:42 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
// G4VPrimaryGenerator
source/g3tog4/GNUmakefile
+4
View File
@@ -78,6 +78,10 @@ Flibsources = $(filter-out $(Fbinsources),$(wildcard src/*.F))
Flibobjects = $(patsubst src/%.F,$(G4TMPDIR)/%.o,$(Flibsources))
Fdependencies = $(patsubst %.o,%.d,$(Fbinobjects) $(Flibobjects))
ifdef G3G4DEBUG
CPPFLAGS += -DG3G4DEBUG
endif
###############################################################################
### user beware! .rz files made with cernlib v 95a cannot be read with later
### versions. You can use cernlib -v option to specify the cernlib version
source/g3tog4/History
+18 -1
View File
@@ -1,8 +1,25 @@
$Id: History,v 1.38 2000/11/28 12:07:54 gcosmo Exp $
$Id: History,v 1.42 2001/03/14 13:27:44 gcosmo Exp $
G3toG4 Modification History (reverse chronological order, please !)
--------------------------------------------------------------------
g3tog4-V03-00-02 14-Mar-2001 G.Cosmo
- G3toG4MakeSolid.cc: fixed bug in construction of G4Sphere where theta and
phi parameters were reversed according to G4Sphere constructor.
Fixes problem report #230.
- G3Division.cc: correction for "PARA". Slices are placed with G4PVPlacement
instead of G4PVReplica for this particular case (I.Hrivnacova).
g3tog4-V03-00-01 14-Feb-2001 G.Cosmo
- Added support for replicated "PARA" shapes in G3Division::CreateSolid(...)
(I.Hrivnacova).
g3tog4-V03-00-00 25-Jan-2001 G.Cosmo
- Fixes for report #188:
o Fixed bug in G3toG4BuildTree(G3VolTableEntry*, G3VolTableEntry*)
when positioning volume copies. Index is now decremented.
o Added -DG3G4DEBUG to CPPFLAGS in GNUmakefile.
g3tog4-V02-00-05 28-Nov-2000 G.Cosmo
- Fixed bug in G3toG4BuildTree::ClearG3PosCopy(G4int). Entry in vector was
not properly destroyed.
source/g3tog4/README
+4 -3
View File
@@ -70,18 +70,19 @@ gmake clean
- GSPART has to be updated.
- Usage of magnetic field class has to be turned on.
the implementation (July 2000)
the implementation (February 2001)
----------------------------------------
- Supported shapes: all G3 shapes except for
"HYPE", "GTRA", "CTUB"
- G3 MANY feature is not supported.
- GSDV* routines for dividing volumes implemented, using
G4PVReplicas, for shapes:
"BOX", "TUBE", "TUBS" - all axes;
"BOX", "TUBE", "TUBS", "PARA" - all axes;
"CONE", "CONS" - axes 2, 3;
"TRD1", "TRD2", "TRAP" - axis 3;
"PGON", "PCON" - axis 2;
"PARA" -axis 1; axis 2,3 for a special case
Unsupported shapes:
"SPHE", "PARA", "ELTU", "HYPE", "GTRA", "CTUB"
"SPHE", "ELTU", "HYPE", "GTRA", "CTUB"
See History file for modification history.
source/g3tog4/include/G3DetTable.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G3DetTable.hh,v 1.6 1999/12/15 14:49:42 gunter Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
// G3DetTable class
source/g3tog4/include/G3DetTableEntry.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G3DetTableEntry.hh,v 1.3 1999/12/09 01:27:42 lockman Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
// G3DetTableEntry class
source/g3tog4/include/G3Division.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G3Division.hh,v 1.4 2000/11/24 09:50:09 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
// ----------------------
// Class description:
source/g3tog4/include/G3EleTable.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G3EleTable.hh,v 1.5 2000/11/24 09:50:09 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
// ----------------------
// Class description:
source/g3tog4/include/G3G4Interface.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G3G4Interface.hh,v 1.7 1999/12/09 01:27:42 lockman Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
// Interfaces for G3 equivalent routines
//
source/g3tog4/include/G3MatTable.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G3MatTable.hh,v 1.9 2000/11/24 09:50:09 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
// ----------------------
// Class description:
source/g3tog4/include/G3MatTableEntry.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G3MatTableEntry.hh,v 1.4 2000/11/24 09:50:09 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
// ----------------------
// Class description:
source/g3tog4/include/G3MedTable.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G3MedTable.hh,v 1.8 2000/11/24 09:50:09 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
// ----------------------
// Class description:
source/g3tog4/include/G3MedTableEntry.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G3MedTableEntry.hh,v 1.4 2000/11/24 09:50:10 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
// ----------------------
// Class description:
source/g3tog4/include/G3PartTable.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G3PartTable.hh,v 1.7 2000/11/24 09:50:10 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
// ----------------------
// Class description:
source/g3tog4/include/G3Pos.hh
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G3Pos.hh,v 1.9 2000/11/24 09:50:10 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
// GEANT4 tag $Name: geant4-03-01 $
//
// ----------------------
// Class description:

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