Import Geant4 5.2.0 source tree
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
$Id: History,v 1.15 2002/12/11 16:01:24 johna Exp $
|
||||
$Id: History,v 1.17 2003/06/18 08:25:25 gcosmo Exp $
|
||||
-------------------------------------------------------------------
|
||||
|
||||
=========================================================
|
||||
@@ -24,6 +24,13 @@ committal in the CVS repository !
|
||||
History file for visualization category
|
||||
---------------------------------------
|
||||
|
||||
18th June 2003 Gabriele Cosmo (raytracer-V05-01-01)
|
||||
- Removed usage of G4USE_STD_NAMESPACE in G4RTJpegMaker.cc, after
|
||||
migration from G4std.
|
||||
|
||||
30th May 2003 Makoto Asai (raytracer-V05-01-00)
|
||||
- Fix pedantic warning message.
|
||||
|
||||
11th December 2002 John Allison (vis-V04-01-10)
|
||||
- Fix for SUN-CC warnings: AddThis hides the virtual function...
|
||||
- Fix memory leak in RayTracer.
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4RTJpeg.hh,v 1.5 2001/07/11 10:09:01 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4RTJpegCoder.hh,v 1.5 2001/07/11 10:09:01 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4RTJpegCoderTables.hh,v 1.5 2001/07/11 10:09:01 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
|
||||
// class description:
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4RTJpegMaker.hh,v 1.5 2001/07/11 10:09:02 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4RTMessenger.hh,v 1.4 2001/07/11 10:09:02 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4RTOutBitStream.hh,v 1.6 2001/07/11 10:09:02 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4RTSteppingAction.hh,v 1.4 2001/07/11 10:09:02 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4RTTrackingAction.hh,v 1.4 2001/07/11 10:09:02 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// $Id: G4RTTrackingAction.hh,v 1.5 2003/05/30 13:01:20 johna Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
|
||||
@@ -62,7 +62,7 @@ class G4RTTrackingAction : public G4UserTrackingAction
|
||||
|
||||
// Member functions
|
||||
virtual void PreUserTrackingAction(const G4Track* aTrack);
|
||||
virtual void PostUserTrackingAction(const G4Track* aTrack){;}
|
||||
virtual void PostUserTrackingAction(const G4Track*){;}
|
||||
|
||||
|
||||
};
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4RayShooter.hh,v 1.3 2001/07/11 10:09:02 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
|
||||
// class description:
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4RayTracer.hh,v 1.8 2001/07/27 22:33:03 johna Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4RayTracerFeatures.hh,v 1.3 2001/07/11 10:09:02 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4RayTracerSceneHandler.hh,v 1.6 2002/12/11 15:59:34 johna Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
|
||||
// John Allison 17th March 2000
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4RayTracerViewer.hh,v 1.4 2001/07/11 10:09:02 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
|
||||
// John Allison 17th March 2000
|
||||
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4RayTrajectory.hh,v 1.9 2002/10/16 11:42:48 johna Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// $Id: G4RayTrajectory.hh,v 1.11 2003/06/16 17:13:42 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
|
||||
@@ -46,7 +46,7 @@ class G4Step;
|
||||
#include "G4VTrajectory.hh"
|
||||
#include "G4Allocator.hh"
|
||||
#include <stdlib.h>
|
||||
#include "g4std/vector"
|
||||
#include <vector>
|
||||
#include "globals.hh"
|
||||
#include "G4Track.hh"
|
||||
#include "G4RayTrajectoryPoint.hh"
|
||||
@@ -65,8 +65,8 @@ class G4RayTrajectory : public G4VTrajectory
|
||||
// inline int operator == (const G4RayTrajectory& right){return (this==&right);}
|
||||
|
||||
virtual void AppendStep(const G4Step*);
|
||||
virtual void ShowTrajectory(G4std::ostream&) const;
|
||||
virtual void DrawTrajectory(G4int i_mode=0) const {;}
|
||||
virtual void ShowTrajectory(std::ostream&) const;
|
||||
virtual void DrawTrajectory(G4int) const {;}
|
||||
virtual int GetPointEntries() const {return positionRecord->size();}
|
||||
virtual G4VTrajectoryPoint* GetPoint(G4int i) const
|
||||
{ return (*positionRecord)[i]; }
|
||||
@@ -84,7 +84,7 @@ class G4RayTrajectory : public G4VTrajectory
|
||||
|
||||
private:
|
||||
|
||||
G4std::vector<G4RayTrajectoryPoint*>* positionRecord;
|
||||
std::vector<G4RayTrajectoryPoint*>* positionRecord;
|
||||
};
|
||||
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4RayTrajectoryPoint.hh,v 1.5 2002/10/16 11:42:48 johna Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4VFigureFileMaker.hh,v 1.4 2001/07/11 10:09:03 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4RTJpegCoder.cc,v 1.4 2001/07/11 10:09:03 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
//
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4RTJpegMaker.cc,v 1.7 2001/11/22 17:29:01 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// $Id: G4RTJpegMaker.cc,v 1.9 2003/06/18 08:23:02 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
//
|
||||
@@ -30,7 +30,7 @@
|
||||
#include "G4RTJpeg.hh"
|
||||
#include "G4RTJpegMaker.hh"
|
||||
#include "G4RTJpegCoder.hh"
|
||||
#include "g4std/fstream"
|
||||
#include <fstream>
|
||||
|
||||
G4RTJpegMaker::G4RTJpegMaker()
|
||||
{;}
|
||||
@@ -62,22 +62,8 @@ void G4RTJpegMaker::CreateFigureFile(G4String fileName,
|
||||
|
||||
aFigure.GetJpegData(&jpegAddress,jpegSize);
|
||||
|
||||
G4std::ofstream ofs;
|
||||
#ifdef G4USE_STD_NAMESPACE
|
||||
ofs.open(fileName,G4std::ios::out|G4std::ios::trunc|G4std::ios::binary);
|
||||
#else
|
||||
ofs.open(fileName,ios::out|ios::trunc);
|
||||
#endif
|
||||
std::ofstream ofs;
|
||||
ofs.open(fileName,std::ios::out|std::ios::trunc|std::ios::binary);
|
||||
ofs.write(jpegAddress,jpegSize);
|
||||
ofs.close();
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4RTMessenger.cc,v 1.6 2002/12/05 01:37:36 asaim Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
//
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4RTOutBitStream.cc,v 1.4 2001/07/11 10:09:04 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
//
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4RTSteppingAction.cc,v 1.6 2001/07/11 10:09:04 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
//
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4RTTrackingAction.cc,v 1.3 2001/07/11 10:09:04 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// $Id: G4RTTrackingAction.cc,v 1.4 2003/05/30 13:01:21 johna Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
//
|
||||
@@ -38,7 +38,7 @@
|
||||
#include "G4ios.hh"
|
||||
|
||||
|
||||
void G4RTTrackingAction :: PreUserTrackingAction(const G4Track* aTrack)
|
||||
void G4RTTrackingAction :: PreUserTrackingAction(const G4Track*)
|
||||
{
|
||||
G4RayTrajectory* aTrajectory=new G4RayTrajectory;
|
||||
fpTrackingManager->SetTrajectory(aTrajectory);
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4RayShooter.cc,v 1.2 2001/07/11 10:09:04 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
|
||||
#include "G4RayShooter.hh"
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4RayTracer.cc,v 1.11 2002/12/11 16:00:00 johna Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
//
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4RayTracerSceneHandler.cc,v 1.2 2001/07/11 10:09:05 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
|
||||
#include "G4RayTracerSceneHandler.hh"
|
||||
|
||||
|
||||
@@ -21,13 +21,13 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4RayTracerViewer.cc,v 1.10 2002/04/22 14:14:38 johna Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// $Id: G4RayTracerViewer.cc,v 1.11 2003/06/16 17:13:44 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
|
||||
#include "G4RayTracerViewer.hh"
|
||||
|
||||
#include "G4ios.hh"
|
||||
#include "g4std/strstream"
|
||||
#include <strstream>
|
||||
|
||||
#include "G4VSceneHandler.hh"
|
||||
#include "G4Scene.hh"
|
||||
@@ -94,8 +94,8 @@ void G4RayTracerViewer::DrawView() {
|
||||
G4RayTracer* theTracer =
|
||||
(G4RayTracer*) fSceneHandler.GetGraphicsSystem();
|
||||
char fileName [100];
|
||||
G4std::ostrstream ost(fileName, 100);
|
||||
std::ostrstream ost(fileName, 100);
|
||||
ost << "g4RayTracer." << fShortName << '_' << fFileCount++ << ".jpeg"
|
||||
<< G4std::ends;
|
||||
<< std::ends;
|
||||
theTracer->Trace(fileName);
|
||||
}
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4RayTrajectory.cc,v 1.9 2002/10/16 11:42:48 johna Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// $Id: G4RayTrajectory.cc,v 1.12 2003/06/16 17:13:45 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
//
|
||||
@@ -46,12 +46,13 @@ G4Allocator<G4RayTrajectory> G4RayTrajectoryAllocator;
|
||||
|
||||
G4RayTrajectory :: G4RayTrajectory()
|
||||
{
|
||||
positionRecord = new G4std::vector<G4RayTrajectoryPoint*>;
|
||||
positionRecord = new std::vector<G4RayTrajectoryPoint*>;
|
||||
}
|
||||
|
||||
G4RayTrajectory :: G4RayTrajectory(G4RayTrajectory & right)
|
||||
: G4VTrajectory()
|
||||
{
|
||||
positionRecord = new G4std::vector<G4RayTrajectoryPoint*>;
|
||||
positionRecord = new std::vector<G4RayTrajectoryPoint*>;
|
||||
for(size_t i=0;i<right.positionRecord->size();i++)
|
||||
{
|
||||
G4RayTrajectoryPoint* rightPoint = (G4RayTrajectoryPoint*)
|
||||
@@ -111,7 +112,7 @@ void G4RayTrajectory::AppendStep(const G4Step* aStep)
|
||||
positionRecord->push_back(trajectoryPoint);
|
||||
}
|
||||
|
||||
void G4RayTrajectory::ShowTrajectory(G4std::ostream& os) const
|
||||
void G4RayTrajectory::ShowTrajectory(std::ostream&) const
|
||||
{ }
|
||||
|
||||
void G4RayTrajectory::MergeTrajectory(G4VTrajectory* secondTrajectory)
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4RayTrajectoryPoint.cc,v 1.3 2001/07/11 10:09:05 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
//
|
||||
|
||||
Reference in New Issue
Block a user