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

Import Geant4 5.2.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-09 10:28:22 +02:00
parent fbd4999cf7
commit 4aea781e80
5454 changed files with 223141 additions and 67347 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/event/History
+11 -1
View File
@@ -1,4 +1,4 @@
$Id: History,v 1.56 2002/12/06 19:17:57 gcosmo Exp $
$Id: History,v 1.59 2003/06/04 16:04:43 gcosmo Exp $
-------------------------------------------------------------------
=========================================================
@@ -17,6 +17,16 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
Jun 04 2003, G.Cosmo (event-V05-01-02)
- Fixes for inclusion of <strstream> in G4HEPEvtInterface.cc in view
of the g4std wrappers migration.
Jun 03 2003, G.Cosmo (event-V05-01-01)
- Fixed trivial warning in G4GeneralParticleSourceMessenger.cc.
May 21 2003, M.Asai (event-V05-01-00)
- Clean up unused variables.
Dec 06 2002, G.Cosmo (event-V04-01-11)
- Corrected tag to include also "event-V04-01-09" !!
source/event/include/G4CellScorer.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4CellScorer.hh,v 1.1 2002/10/28 10:06:00 dressel Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
// ----------------------------------------------------------------------
// Class G4CellScorer
source/event/include/G4CellScorerStore.hh
+4 -4
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4CellScorerStore.hh,v 1.1 2002/10/28 10:06:00 dressel Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4CellScorerStore.hh,v 1.2 2003/06/16 16:50:26 gunter Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
// ----------------------------------------------------------------------
// Class G4CellScorerStore
@@ -43,7 +43,7 @@
#ifndef G4CellScorerStore_hh
#define G4CellScorerStore_hh G4CellScorerStore_hh
#include "g4std/map"
#include <map>
#include "G4GeometryCell.hh"
#include "globals.hh"
@@ -52,7 +52,7 @@
class G4CellScorer;
typedef G4std::map<G4GeometryCell, G4CellScorer *, G4GeometryCellComp> G4MapGeometryCellCellScorer;
typedef std::map<G4GeometryCell, G4CellScorer *, G4GeometryCellComp> G4MapGeometryCellCellScorer;
class G4CellScorerStore : public G4VCellScorerStore {
public: // with description
source/event/include/G4ClassificationOfNewTrack.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4ClassificationOfNewTrack.hh,v 1.5 2001/07/19 00:14:15 asaim Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
source/event/include/G4EvManMessenger.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4EvManMessenger.hh,v 1.4 2001/07/11 09:58:47 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
#ifndef G4EvManMessenger_h
source/event/include/G4Event.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Event.hh,v 1.6 2002/08/13 18:17:53 asaim Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
#ifndef G4Event_h
source/event/include/G4EventManager.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4EventManager.hh,v 1.9 2001/07/19 00:14:15 asaim Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
source/event/include/G4GeneralParticleSource.hh
+1 -1
View File
@@ -32,7 +32,7 @@
//
///////////////////////////////////////////////////////////////////////////////
// $Id: G4GeneralParticleSource.hh,v 1.7 2001/10/19 16:48:28 flei Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
///////////////////////////////////////////////////////////////////////////////
//
// Class Description:
source/event/include/G4GeneralParticleSourceMessenger.hh
+1 -1
View File
@@ -32,7 +32,7 @@
//
///////////////////////////////////////////////////////////////////////////////
// $Id: G4GeneralParticleSourceMessenger.hh,v 1.8 2002/02/26 16:34:04 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
///////////////////////////////////////////////////////////////////////////////
//
// Class Description:
source/event/include/G4HEPEvtInterface.hh
+6 -6
View File
@@ -21,15 +21,15 @@
// ********************************************************************
//
//
// $Id: G4HEPEvtInterface.hh,v 1.6 2001/07/11 09:58:48 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4HEPEvtInterface.hh,v 1.7 2003/06/16 16:50:27 gunter Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
#ifndef G4HEPEvtInterface_h
#define G4HEPEvtInterface_h 1
#include "g4std/fstream"
#include "g4std/vector"
#include <fstream>
#include <vector>
#include "globals.hh"
#include "G4VPrimaryGenerator.hh"
#include "G4HEPEvtParticle.hh"
@@ -85,8 +85,8 @@ class G4HEPEvtInterface:public G4VPrimaryGenerator
private:
G4String fileName;
G4std::ifstream inputFile;
G4std::vector<G4HEPEvtParticle*> HPlist;
std::ifstream inputFile;
std::vector<G4HEPEvtParticle*> HPlist;
};
#endif
source/event/include/G4HEPEvtParticle.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4HEPEvtParticle.hh,v 1.5 2001/07/13 15:01:45 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
source/event/include/G4HepMCAsciiReader.hh
+3 -3
View File
@@ -23,13 +23,13 @@
// ====================================================================
//
// G4HepMCAsciiReader.hh
// $Id: G4HepMCAsciiReader.hh,v 1.1 2002/11/18 22:43:13 asaim Exp $
// $Id: G4HepMCAsciiReader.hh,v 1.2 2003/06/16 16:50:28 gunter Exp $
//
// ====================================================================
#ifndef G4_HEPMC_ASCII_READER_H
#define G4_HEPMC_ASCII_READER_H
#include "g4std/fstream"
#include <fstream>
#include "G4HepMCInterface.hh"
#include "CLHEP/HepMC/ReadHepMC.h"
@@ -38,7 +38,7 @@ class G4HepMCAsciiReaderMessenger;
class G4HepMCAsciiReader : public G4HepMCInterface {
protected:
G4String filename;
G4std::ifstream from;
std::ifstream from;
G4int verbose;
G4HepMCAsciiReaderMessenger* messenger;
source/event/include/G4ParticleGun.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4ParticleGun.hh,v 1.7 2001/11/20 23:21:41 asaim Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
#ifndef G4ParticleGun_h
source/event/include/G4ParticleGunMessenger.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4ParticleGunMessenger.hh,v 1.7 2002/02/26 16:34:04 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
source/event/include/G4PrimaryParticle.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4PrimaryParticle.hh,v 1.10 2001/07/13 15:01:46 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
source/event/include/G4PrimaryTransformer.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4PrimaryTransformer.hh,v 1.6 2001/07/18 01:25:44 asaim Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
#ifndef G4PromaryTransformer_h
source/event/include/G4PrimaryVertex.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4PrimaryVertex.hh,v 1.7 2001/07/13 15:01:46 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
source/event/include/G4ScoreTable.hh
+10 -10
View File
@@ -20,8 +20,8 @@
// * statement, and all its terms. *
// ********************************************************************
//
// $Id: G4ScoreTable.hh,v 1.1 2002/10/28 10:06:01 dressel Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4ScoreTable.hh,v 1.2 2003/06/16 16:50:29 gunter Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
// ----------------------------------------------------------------------
// Class G4ScoreTable
@@ -39,9 +39,9 @@
#ifndef G4ScoreTable_hh
#define G4ScoreTable_hh G4ScoreTable_hh
#include "g4std/iostream"
#include "g4std/iomanip"
#include "g4std/vector"
#include <iostream>
#include <iomanip>
#include <vector>
#include "globals.hh"
#include "G4CellScorerStore.hh"
@@ -57,17 +57,17 @@ public: // with description
~G4ScoreTable();
void Print(const G4MapGeometryCellCellScorer &cs,
G4std::ostream *out = 0);
std::ostream *out = 0);
// create the table and print it to the ouput stream.
void PrintHeader(G4std::ostream *out);
void PrintHeader(std::ostream *out);
// print the table header, done by the above Print() function
void PrintTable(const G4MapGeometryCellCellScorer &cs,
G4std::ostream *out);
std::ostream *out);
// print the table contend, done by the above Print() function
G4std::string FillString(const G4std::string &name,
std::string FillString(const std::string &name,
char c, G4int n, G4bool back = true);
// create a string of length n, by filling up
// name with the char c.
@@ -79,7 +79,7 @@ private:
G4String CreateName(const G4GeometryCell &gCell);
void PrintLine(const G4String &name,
const G4CellScoreValues &sc_scores,
G4std::ostream *out);
std::ostream *out);
const G4VIStore *fIStore;
G4int FieldName;
G4int FieldValue;
source/event/include/G4Scorer.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Scorer.hh,v 1.1 2002/10/28 10:06:01 dressel Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
// ----------------------------------------------------------------------
// Class G4Scorer
source/event/include/G4StackManager.hh
+3 -3
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4StackManager.hh,v 1.10 2002/08/24 17:36:23 asaim Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4StackManager.hh,v 1.11 2003/06/16 16:50:30 gunter Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//
@@ -109,7 +109,7 @@ class G4StackManager
G4TrackStack * waitingStack;
G4TrackStack * postponeStack;
G4StackingMessenger* theMessenger;
G4std::vector<G4TrackStack*> additionalWaitingStacks;
std::vector<G4TrackStack*> additionalWaitingStacks;
G4int numberOfAdditionalWaitingStacks;
public:
source/event/include/G4StackedTrack.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4StackedTrack.hh,v 1.6 2001/07/13 15:01:47 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Last Modification : 02/Feb/96 M.Asai
source/event/include/G4StackingMessenger.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4StackingMessenger.hh,v 1.4 2001/07/11 09:58:49 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
#ifndef G4StackingMessenger_h
source/event/include/G4TrackStack.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4TrackStack.hh,v 1.5 2001/07/13 15:01:47 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Last Modification : 09/Dec/96 M.Asai
source/event/include/G4TrajectoryContainer.hh
+4 -4
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4TrajectoryContainer.hh,v 1.10 2002/06/08 20:36:18 asaim Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4TrajectoryContainer.hh,v 1.11 2003/06/16 16:50:31 gunter Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// G4TrajectoryContainer
@@ -40,9 +40,9 @@
#include "globals.hh"
#include "G4VTrajectory.hh"
#include "G4Allocator.hh"
#include "g4std/vector"
#include <vector>
typedef G4std::vector<G4VTrajectory*> TrajectoryVector;
typedef std::vector<G4VTrajectory*> TrajectoryVector;
class G4TrajectoryContainer
{
source/event/include/G4UserEventAction.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4UserEventAction.hh,v 1.5 2001/07/11 09:58:50 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
//
source/event/include/G4UserStackingAction.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4UserStackingAction.hh,v 1.5 2001/07/11 09:58:50 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
#ifndef G4UserStackingAction_h
source/event/include/G4VPrimaryGenerator.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4VPrimaryGenerator.hh,v 1.6 2001/11/21 13:48:40 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
#ifndef G4VPrimaryGenerator_h
source/event/include/eventgendefs.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: eventgendefs.hh,v 1.3 2001/07/11 09:58:50 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
#ifndef EventGenerator_DEBUG
#define EventGenerator_DEBUG
source/event/include/evmandefs.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: evmandefs.hh,v 1.3 2001/07/11 09:58:50 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
///#define G4EVENTMANAGER_DEBUG 1
source/event/include/trajectoryControl.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: trajectoryControl.hh,v 1.3 2001/07/11 09:58:51 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
////#define G4_STORE_TRAJECTORY 1
source/event/src/G4CellScorer.cc
+3 -3
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4CellScorer.cc,v 1.2 2002/11/23 12:30:40 dressel Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4CellScorer.cc,v 1.3 2003/04/29 07:05:38 dressel Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
// ----------------------------------------------------------------------
// GEANT 4 class source file
@@ -71,7 +71,7 @@ void G4CellScorer::ScoreAnInVolumeStep(const G4Step &aStep,
}
void G4CellScorer::ScorePopulation(const G4GeometryCell &post_gCell,
void G4CellScorer::ScorePopulation(const G4GeometryCell &,
const G4Step &aStep) {
// check for new event
fTrackLogger.SetEventID(G4EventManager::GetEventManager()->
source/event/src/G4CellScorerStore.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4CellScorerStore.cc,v 1.2 2002/11/04 10:52:39 dressel Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
// ----------------------------------------------------------------------
// GEANT 4 class source file
source/event/src/G4EvManMessenger.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4EvManMessenger.cc,v 1.4 2002/12/04 18:43:15 asaim Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
// --------------------------------------------------------------------
source/event/src/G4Event.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Event.cc,v 1.5 2002/08/13 18:17:53 asaim Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
// G4Event
source/event/src/G4EventManager.cc
+5 -7
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4EventManager.cc,v 1.12 2002/05/15 05:47:49 asaim Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4EventManager.cc,v 1.13 2003/05/21 20:52:53 asaim Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//
//
@@ -63,11 +63,9 @@ G4EventManager::G4EventManager()
}
// private -> never called
G4EventManager::G4EventManager(const G4EventManager &right) { }
G4EventManager& G4EventManager::operator=(const G4EventManager& right)
{
return *this;
}
G4EventManager::G4EventManager(const G4EventManager&) {;}
G4EventManager& G4EventManager::operator=(const G4EventManager&)
{ return *this; }
G4EventManager::~G4EventManager()
{
source/event/src/G4GeneralParticleSource.cc
+1 -1
View File
@@ -39,7 +39,7 @@
//
///////////////////////////////////////////////////////////////////////////////
// $Id: G4GeneralParticleSource.cc,v 1.14 2001/10/19 16:48:28 flei Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
///////////////////////////////////////////////////////////////////////////////
//
// CHANGE HISTORY
source/event/src/G4GeneralParticleSourceMessenger.cc
+4 -4
View File
@@ -67,10 +67,10 @@
#include "G4ios.hh"
//#include <iostream.h>
#include "g4std/fstream"
#include <fstream>
#include "g4std/iomanip"
#include "g4std/strstream"
#include <iomanip>
#include <strstream>
#include "G4Tokenizer.hh"
#include "G4GeneralParticleSourceMessenger.hh"
@@ -785,7 +785,7 @@ void G4GeneralParticleSourceMessenger::SetNewValue(G4UIcommand *command, G4Strin
}
}
G4String G4GeneralParticleSourceMessenger::GetCurrentValue(G4UIcommand * command)
G4String G4GeneralParticleSourceMessenger::GetCurrentValue(G4UIcommand *)
{
G4String cv;
source/event/src/G4HEPEvtInterface.cc
+4 -3
View File
@@ -21,13 +21,14 @@
// ********************************************************************
//
//
// $Id: G4HEPEvtInterface.cc,v 1.7 2001/11/20 23:21:41 asaim Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4HEPEvtInterface.cc,v 1.9 2003/06/16 16:50:33 gunter Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// --------------------------------------------------------------------
#include "g4std/strstream"
#include "G4Types.hh"
#include <strstream>
#include "G4ios.hh"
#include "G4HEPEvtInterface.hh"
source/event/src/G4HEPEvtParticle.cc
+5 -5
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4HEPEvtParticle.cc,v 1.4 2001/07/13 15:01:53 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4HEPEvtParticle.cc,v 1.5 2003/05/21 20:52:53 asaim Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//
@@ -42,13 +42,13 @@ G4HEPEvtParticle::~G4HEPEvtParticle()
{;}
const G4HEPEvtParticle &
G4HEPEvtParticle::operator=(const G4HEPEvtParticle &right)
G4HEPEvtParticle::operator=(const G4HEPEvtParticle &)
{ return *this; }
G4int G4HEPEvtParticle::operator==(const G4HEPEvtParticle &right) const
{ return false; }
{ return (this==&right); }
G4int G4HEPEvtParticle::operator!=(const G4HEPEvtParticle &right) const
{ return true; }
{ return (this!=&right); }
source/event/src/G4HepMCAsciiReader.cc
+2 -2
View File
@@ -23,7 +23,7 @@
// ====================================================================
//
// G4HepMCAsciiReader.cc
// $Id: G4HepMCAsciiReader.cc,v 1.2 2002/12/03 14:44:32 gcosmo Exp $
// $Id: G4HepMCAsciiReader.cc,v 1.3 2003/06/16 16:50:34 gunter Exp $
//
// ====================================================================
@@ -55,7 +55,7 @@ void G4HepMCAsciiReader::Initialize()
/////////////////////////////////////
{
from.close();
from.open(filename.c_str(), G4std::ios::in);
from.open(filename.c_str(), std::ios::in);
}
/////////////////////////////////////////////////////////
source/event/src/G4ParticleGun.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4ParticleGun.cc,v 1.6 2001/11/20 23:21:41 asaim Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
// G4ParticleGun
source/event/src/G4ParticleGunMessenger.cc
+4 -4
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4ParticleGunMessenger.cc,v 1.8 2002/02/26 16:34:06 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4ParticleGunMessenger.cc,v 1.9 2003/06/16 16:50:35 gunter Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
#include "G4ParticleGunMessenger.hh"
@@ -41,8 +41,8 @@
#include "G4ios.hh"
#include "G4Tokenizer.hh"
#include "g4std/iomanip"
#include "g4std/strstream"
#include <iomanip>
#include <strstream>
G4ParticleGunMessenger::G4ParticleGunMessenger(G4ParticleGun * fPtclGun)
:fParticleGun(fPtclGun),fShootIon(false)
source/event/src/G4PrimaryParticle.cc
+5 -5
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PrimaryParticle.cc,v 1.9 2002/08/19 20:20:18 asaim Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4PrimaryParticle.cc,v 1.10 2003/05/21 20:52:53 asaim Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
#include "G4PrimaryParticle.hh"
@@ -90,12 +90,12 @@ void G4PrimaryParticle::SetG4code(G4ParticleDefinition* Gcode)
}
const G4PrimaryParticle &
G4PrimaryParticle::operator=(const G4PrimaryParticle &right)
G4PrimaryParticle::operator=(const G4PrimaryParticle &)
{ return *this; }
G4int G4PrimaryParticle::operator==(const G4PrimaryParticle &right) const
{ return false; }
{ return (this==&right); }
G4int G4PrimaryParticle::operator!=(const G4PrimaryParticle &right) const
{ return true; }
{ return (this!=&right); }
void G4PrimaryParticle::Print() const
{
source/event/src/G4PrimaryTransformer.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4PrimaryTransformer.cc,v 1.15 2002/08/19 20:20:18 asaim Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
#include "G4PrimaryTransformer.hh"
source/event/src/G4PrimaryVertex.cc
+5 -5
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4PrimaryVertex.cc,v 1.5 2001/07/13 15:01:54 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4PrimaryVertex.cc,v 1.6 2003/05/21 20:52:54 asaim Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
#include "G4PrimaryVertex.hh"
@@ -59,12 +59,12 @@ G4PrimaryVertex::~G4PrimaryVertex()
}
const G4PrimaryVertex &
G4PrimaryVertex::operator=(const G4PrimaryVertex &right)
G4PrimaryVertex::operator=(const G4PrimaryVertex &)
{ return *this; }
G4int G4PrimaryVertex::operator==(const G4PrimaryVertex &right) const
{ return false; }
{ return (this==&right); }
G4int G4PrimaryVertex::operator!=(const G4PrimaryVertex &right) const
{ return true; }
{ return (this!=&right); }
void G4PrimaryVertex::Print() const
{
source/event/src/G4ScoreTable.cc
+27 -27
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4ScoreTable.cc,v 1.2 2002/11/04 10:52:39 dressel Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4ScoreTable.cc,v 1.3 2003/06/16 16:50:36 gunter Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
// ----------------------------------------------------------------------
// GEANT 4 class source file
@@ -32,11 +32,11 @@
// ----------------------------------------------------------------------
#include "G4ScoreTable.hh"
#include "g4std/strstream"
#include <strstream>
#include "G4VPhysicalVolume.hh"
#include "G4VIStore.hh"
#include "g4std/set"
#include <set>
#include "G4CellScorer.hh"
@@ -50,7 +50,7 @@ G4ScoreTable::~G4ScoreTable()
{}
void G4ScoreTable::
Print(const G4MapGeometryCellCellScorer &cs,
G4std::ostream *out){
std::ostream *out){
if (!out) {
out = &G4cout;
}
@@ -58,9 +58,9 @@ Print(const G4MapGeometryCellCellScorer &cs,
PrintTable(cs, out);
}
void G4ScoreTable::PrintHeader(G4std::ostream *out)
void G4ScoreTable::PrintHeader(std::ostream *out)
{
G4std::vector<G4String> vecScoreName;
std::vector<G4String> vecScoreName;
vecScoreName.push_back("Importance");
vecScoreName.push_back("Tr.Entering");
vecScoreName.push_back("Population");
@@ -71,9 +71,9 @@ void G4ScoreTable::PrintHeader(G4std::ostream *out)
vecScoreName.push_back("Av.Tr.WGT");
// head line
G4std::string vname = FillString("Volume name", ' ', FieldName+1);
std::string vname = FillString("Volume name", ' ', FieldName+1);
*out << vname << '|';
for (G4std::vector<G4String>::iterator it = vecScoreName.begin();
for (std::vector<G4String>::iterator it = vecScoreName.begin();
it != vecScoreName.end(); it++) {
vname = FillString((*it),
' ',
@@ -87,7 +87,7 @@ void G4ScoreTable::PrintHeader(G4std::ostream *out)
G4String G4ScoreTable::CreateName(const G4GeometryCell &gCell) {
char st[200];
G4std::ostrstream os(st,200);
std::ostrstream os(st,200);
os << gCell.GetPhysicalVolume().GetName()
<< "_rep:" << gCell.GetReplicaNumber()
<< '\0';
@@ -98,11 +98,11 @@ G4String G4ScoreTable::CreateName(const G4GeometryCell &gCell) {
void G4ScoreTable::PrintTable(const G4MapGeometryCellCellScorer &mcs,
G4std::ostream *out) {
std::ostream *out) {
// this lines sort the ScoreValues according to the volume
// name they belong to
G4std::map<G4String , G4CellScoreComposer> MapStringSCScorer;
std::map<G4String , G4CellScoreComposer> MapStringSCScorer;
for (G4MapGeometryCellCellScorer::const_iterator mit =
mcs.begin();
mit != mcs.end(); ++mit) {
@@ -119,7 +119,7 @@ void G4ScoreTable::PrintTable(const G4MapGeometryCellCellScorer &mcs,
MapStringSCScorer[name].SetImportnace(importance);
}
// now do the printing
for ( G4std::map<G4String , G4CellScoreComposer>::iterator
for ( std::map<G4String , G4CellScoreComposer>::iterator
it = MapStringSCScorer.begin();
it != MapStringSCScorer.end(); ++it) {
G4String name((*it).first);
@@ -131,23 +131,23 @@ void G4ScoreTable::PrintTable(const G4MapGeometryCellCellScorer &mcs,
void G4ScoreTable::PrintLine(const G4String &name,
const G4CellScoreValues &sc_scores,
G4std::ostream *out)
std::ostream *out)
{
G4std::string fname = FillString(name, '.', FieldName);
std::string fname = FillString(name, '.', FieldName);
*out << fname << " |";
*out << G4std::setw(FieldValue) << sc_scores.fImportance
*out << std::setw(FieldValue) << sc_scores.fImportance
<< " |";
*out << G4std::setw(FieldValue) << sc_scores.fSumTracksEntering
*out << std::setw(FieldValue) << sc_scores.fSumTracksEntering
<< " |";
*out << G4std::setw(FieldValue) << sc_scores.fSumPopulation << " |";
*out << G4std::setw(FieldValue) << sc_scores.fSumCollisions << " |";
*out << G4std::setw(FieldValue) << sc_scores.fSumCollisionsWeight
*out << std::setw(FieldValue) << sc_scores.fSumPopulation << " |";
*out << std::setw(FieldValue) << sc_scores.fSumCollisions << " |";
*out << std::setw(FieldValue) << sc_scores.fSumCollisionsWeight
<< " |";
*out << G4std::setw(FieldValue) << sc_scores.fNumberWeightedEnergy
*out << std::setw(FieldValue) << sc_scores.fNumberWeightedEnergy
<< " |";
*out << G4std::setw(FieldValue) << sc_scores.fFluxWeightedEnergy
*out << std::setw(FieldValue) << sc_scores.fFluxWeightedEnergy
<< " |";
*out << G4std::setw(FieldValue) << sc_scores.fAverageTrackWeight*
*out << std::setw(FieldValue) << sc_scores.fAverageTrackWeight*
sc_scores.fImportance
<< " |";
@@ -155,18 +155,18 @@ void G4ScoreTable::PrintLine(const G4String &name,
}
G4std::string G4ScoreTable::FillString(const G4std::string &name,
std::string G4ScoreTable::FillString(const std::string &name,
char c, G4int n, G4bool back)
{
G4std::string fname("");
std::string fname("");
G4int k = n - name.size();
if (k > 0) {
if (back) {
fname = name;
fname += G4std::string(k,c);
fname += std::string(k,c);
}
else {
fname = G4std::string(k,c);
fname = std::string(k,c);
fname += name;
}
}
source/event/src/G4Scorer.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Scorer.cc,v 1.1 2002/10/28 10:06:01 dressel Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
// ----------------------------------------------------------------------
// GEANT 4 class source file
source/event/src/G4StackManager.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4StackManager.cc,v 1.8 2002/12/03 17:04:22 asaim Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Last Modification : 09/Dec/96 M.Asai
source/event/src/G4StackedTrack.cc
+5 -5
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4StackedTrack.cc,v 1.5 2001/07/13 15:01:55 gcosmo Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4StackedTrack.cc,v 1.6 2003/05/21 20:52:54 asaim Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
//
// Last Modification : 02/Feb/96 M.Asai
@@ -45,11 +45,11 @@ G4StackedTrack::G4StackedTrack(G4Track * newTrack, G4VTrajectory * aTrajectory)
G4StackedTrack::~G4StackedTrack()
{ }
const G4StackedTrack & G4StackedTrack::operator=(const G4StackedTrack &right)
const G4StackedTrack & G4StackedTrack::operator=(const G4StackedTrack &)
{ return *this; }
G4int G4StackedTrack::operator==(const G4StackedTrack &right) const
{ return false; }
{ return (this==&right); }
G4int G4StackedTrack::operator!=(const G4StackedTrack &right) const
{ return true; }
{ return (this!=&right); }
source/event/src/G4StackingMessenger.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4StackingMessenger.cc,v 1.4 2002/12/04 18:43:15 asaim Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
// --------------------------------------------------------------------
source/event/src/G4TrackStack.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4TrackStack.cc,v 1.5 2002/12/03 17:04:22 asaim Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
#include "G4TrackStack.hh"
source/event/src/G4TrajectoryContainer.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4TrajectoryContainer.cc,v 1.2 2002/10/06 11:46:48 asaim Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
#include "G4TrajectoryContainer.hh"
source/event/src/G4UserEventAction.cc
+4 -4
View File
@@ -21,17 +21,17 @@
// ********************************************************************
//
//
// $Id: G4UserEventAction.cc,v 1.4 2001/07/11 09:58:54 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4UserEventAction.cc,v 1.5 2003/05/21 20:52:54 asaim Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
#include "G4UserEventAction.hh"
#include "G4Event.hh"
#include "G4EventManager.hh"
void G4UserEventAction::BeginOfEventAction(const G4Event* anEvent)
void G4UserEventAction::BeginOfEventAction(const G4Event*)
{;}
void G4UserEventAction::EndOfEventAction(const G4Event* anEvent)
void G4UserEventAction::EndOfEventAction(const G4Event*)
{;}
source/event/src/G4UserStackingAction.cc
+3 -3
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4UserStackingAction.cc,v 1.4 2001/07/11 09:58:54 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// $Id: G4UserStackingAction.cc,v 1.5 2003/05/21 20:52:54 asaim Exp $
// GEANT4 tag $Name: geant4-05-02 $
//
#include "G4UserStackingAction.hh"
@@ -36,7 +36,7 @@ G4UserStackingAction::~G4UserStackingAction()
{;}
G4ClassificationOfNewTrack G4UserStackingAction::ClassifyNewTrack
(const G4Track* aTrack)
(const G4Track*)
{
return fUrgent;
}
source/event/src/G4VPrimaryGenerator.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4VPrimaryGenerator.cc,v 1.3 2001/07/11 09:58:54 gunter Exp $
// GEANT4 tag $Name: geant4-05-01 $
// GEANT4 tag $Name: geant4-05-02 $
//
// G4VPrimaryGenerator