Import Geant4 5.2.0 source tree
This commit is contained in:
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4UIaliasList.cc,v 1.5 2002/04/26 22:03:35 asaim Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
|
||||
#include "G4UIaliasList.hh"
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4UIbatch.cc,v 1.11 2002/06/07 17:37:44 asaim Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
|
||||
#include "G4UIbatch.hh"
|
||||
|
||||
@@ -21,13 +21,13 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4UIcmdWith3Vector.cc,v 1.4 2002/04/26 22:03:35 asaim Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// $Id: G4UIcmdWith3Vector.cc,v 1.5 2003/06/16 16:55:36 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
|
||||
#include "G4UIcmdWith3Vector.hh"
|
||||
#include "g4std/strstream"
|
||||
#include <strstream>
|
||||
|
||||
G4UIcmdWith3Vector::G4UIcmdWith3Vector
|
||||
(const char * theCommandPath,G4UImessenger * theMessenger)
|
||||
@@ -46,7 +46,7 @@ G4ThreeVector G4UIcmdWith3Vector::GetNew3VectorValue(const char* paramString)
|
||||
G4double vx;
|
||||
G4double vy;
|
||||
G4double vz;
|
||||
G4std::istrstream is((char*)paramString);
|
||||
std::istrstream is((char*)paramString);
|
||||
is >> vx >> vy >> vz;
|
||||
return G4ThreeVector(vx,vy,vz);
|
||||
}
|
||||
@@ -54,7 +54,7 @@ G4ThreeVector G4UIcmdWith3Vector::GetNew3VectorValue(const char* paramString)
|
||||
G4String G4UIcmdWith3Vector::ConvertToString(G4ThreeVector vec)
|
||||
{
|
||||
char st[100];
|
||||
G4std::ostrstream os(st,100);
|
||||
std::ostrstream os(st,100);
|
||||
os << vec.x() << " " << vec.y() << " " << vec.z() << '\0';
|
||||
G4String vl = st;
|
||||
return vl;
|
||||
|
||||
@@ -21,13 +21,13 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4UIcmdWith3VectorAndUnit.cc,v 1.4 2002/04/26 22:03:35 asaim Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// $Id: G4UIcmdWith3VectorAndUnit.cc,v 1.5 2003/06/16 16:55:37 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
|
||||
#include "G4UIcmdWith3VectorAndUnit.hh"
|
||||
#include "g4std/strstream"
|
||||
#include <strstream>
|
||||
|
||||
G4UIcmdWith3VectorAndUnit::G4UIcmdWith3VectorAndUnit
|
||||
(const char * theCommandPath,G4UImessenger * theMessenger)
|
||||
@@ -50,7 +50,7 @@ G4ThreeVector G4UIcmdWith3VectorAndUnit::GetNew3VectorValue(const char* paramStr
|
||||
G4double vy;
|
||||
G4double vz;
|
||||
char unts[30];
|
||||
G4std::istrstream is((char*)paramString);
|
||||
std::istrstream is((char*)paramString);
|
||||
is >> vx >> vy >> vz >> unts;
|
||||
G4String unt = unts;
|
||||
G4double uv = ValueOf(unt);
|
||||
@@ -63,7 +63,7 @@ G4ThreeVector G4UIcmdWith3VectorAndUnit::GetNew3VectorRawValue(const char* param
|
||||
G4double vy;
|
||||
G4double vz;
|
||||
char unts[30];
|
||||
G4std::istrstream is((char*)paramString);
|
||||
std::istrstream is((char*)paramString);
|
||||
is >> vx >> vy >> vz >> unts;
|
||||
return G4ThreeVector(vx,vy,vz);
|
||||
}
|
||||
@@ -74,7 +74,7 @@ G4double G4UIcmdWith3VectorAndUnit::GetNewUnitValue(const char* paramString)
|
||||
G4double vy;
|
||||
G4double vz;
|
||||
char unts[30];
|
||||
G4std::istrstream is((char*)paramString);
|
||||
std::istrstream is((char*)paramString);
|
||||
is >> vx >> vy >> vz >> unts;
|
||||
G4String unt = unts;
|
||||
return ValueOf(unt);
|
||||
@@ -87,7 +87,7 @@ G4String G4UIcmdWith3VectorAndUnit::ConvertToString
|
||||
G4double uv = ValueOf(unitName);
|
||||
|
||||
char st[100];
|
||||
G4std::ostrstream os(st,100);
|
||||
std::ostrstream os(st,100);
|
||||
os << vec.x()/uv << " " << vec.y()/uv << " " << vec.z()/uv
|
||||
<< " " << unitName << '\0';
|
||||
G4String vl = st;
|
||||
|
||||
@@ -21,13 +21,13 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4UIcmdWithABool.cc,v 1.4 2002/04/26 22:03:35 asaim Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// $Id: G4UIcmdWithABool.cc,v 1.5 2003/06/16 16:55:38 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
|
||||
#include "G4UIcmdWithABool.hh"
|
||||
#include "g4std/strstream"
|
||||
#include <strstream>
|
||||
|
||||
G4UIcmdWithABool::G4UIcmdWithABool
|
||||
(const char * theCommandPath,G4UImessenger * theMessenger)
|
||||
|
||||
@@ -21,13 +21,13 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4UIcmdWithADouble.cc,v 1.4 2002/04/26 22:03:35 asaim Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// $Id: G4UIcmdWithADouble.cc,v 1.5 2003/06/16 16:55:39 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
|
||||
#include "G4UIcmdWithADouble.hh"
|
||||
#include "g4std/strstream"
|
||||
#include <strstream>
|
||||
|
||||
G4UIcmdWithADouble::G4UIcmdWithADouble
|
||||
(const char * theCommandPath,G4UImessenger * theMessenger)
|
||||
@@ -40,7 +40,7 @@ G4UIcmdWithADouble::G4UIcmdWithADouble
|
||||
G4double G4UIcmdWithADouble::GetNewDoubleValue(const char* paramString)
|
||||
{
|
||||
G4double vl;
|
||||
G4std::istrstream is((char*)paramString);
|
||||
std::istrstream is((char*)paramString);
|
||||
is >> vl;
|
||||
return vl;
|
||||
}
|
||||
@@ -48,7 +48,7 @@ G4double G4UIcmdWithADouble::GetNewDoubleValue(const char* paramString)
|
||||
G4String G4UIcmdWithADouble::ConvertToString(G4double dblValue)
|
||||
{
|
||||
char st[20];
|
||||
G4std::ostrstream os(st,20);
|
||||
std::ostrstream os(st,20);
|
||||
os << dblValue << '\0';
|
||||
G4String vl = st;
|
||||
return vl;
|
||||
|
||||
@@ -21,13 +21,13 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4UIcmdWithADoubleAndUnit.cc,v 1.4 2002/04/26 22:03:35 asaim Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// $Id: G4UIcmdWithADoubleAndUnit.cc,v 1.5 2003/06/16 16:55:40 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
|
||||
#include "G4UIcmdWithADoubleAndUnit.hh"
|
||||
#include "g4std/strstream"
|
||||
#include <strstream>
|
||||
|
||||
G4UIcmdWithADoubleAndUnit::G4UIcmdWithADoubleAndUnit
|
||||
(const char * theCommandPath,G4UImessenger * theMessenger)
|
||||
@@ -45,7 +45,7 @@ G4double G4UIcmdWithADoubleAndUnit::GetNewDoubleValue(const char* paramString)
|
||||
G4double vl;
|
||||
char unts[30];
|
||||
|
||||
G4std::istrstream is((char*)paramString);
|
||||
std::istrstream is((char*)paramString);
|
||||
is >> vl >> unts;
|
||||
G4String unt = unts;
|
||||
|
||||
@@ -57,7 +57,7 @@ G4double G4UIcmdWithADoubleAndUnit::GetNewDoubleRawValue(const char* paramString
|
||||
G4double vl;
|
||||
char unts[30];
|
||||
|
||||
G4std::istrstream is((char*)paramString);
|
||||
std::istrstream is((char*)paramString);
|
||||
is >> vl >> unts;
|
||||
|
||||
return vl;
|
||||
@@ -68,7 +68,7 @@ G4double G4UIcmdWithADoubleAndUnit::GetNewUnitValue(const char* paramString)
|
||||
G4double vl;
|
||||
char unts[30];
|
||||
|
||||
G4std::istrstream is((char*)paramString);
|
||||
std::istrstream is((char*)paramString);
|
||||
is >> vl >> unts;
|
||||
G4String unt = unts;
|
||||
|
||||
@@ -82,7 +82,7 @@ G4String G4UIcmdWithADoubleAndUnit::ConvertToString
|
||||
G4double uv = ValueOf(unitName);
|
||||
|
||||
char st[50];
|
||||
G4std::ostrstream os(st,50);
|
||||
std::ostrstream os(st,50);
|
||||
os << dblValue/uv << " " << unitName << '\0';
|
||||
G4String vl = st;
|
||||
return vl;
|
||||
|
||||
@@ -21,13 +21,13 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4UIcmdWithAString.cc,v 1.3 2001/07/11 10:01:16 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// $Id: G4UIcmdWithAString.cc,v 1.4 2003/06/16 16:55:41 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
|
||||
#include "G4UIcmdWithAString.hh"
|
||||
#include "g4std/strstream"
|
||||
#include <strstream>
|
||||
|
||||
G4UIcmdWithAString::G4UIcmdWithAString
|
||||
(const char * theCommandPath,G4UImessenger * theMessenger)
|
||||
|
||||
@@ -21,13 +21,13 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4UIcmdWithAnInteger.cc,v 1.4 2002/04/26 22:03:35 asaim Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// $Id: G4UIcmdWithAnInteger.cc,v 1.5 2003/06/16 16:55:42 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
|
||||
#include "G4UIcmdWithAnInteger.hh"
|
||||
#include "g4std/strstream"
|
||||
#include <strstream>
|
||||
|
||||
G4UIcmdWithAnInteger::G4UIcmdWithAnInteger
|
||||
(const char * theCommandPath,G4UImessenger * theMessenger)
|
||||
@@ -40,7 +40,7 @@ G4UIcmdWithAnInteger::G4UIcmdWithAnInteger
|
||||
G4int G4UIcmdWithAnInteger::GetNewIntValue(const char* paramString)
|
||||
{
|
||||
G4int vl;
|
||||
G4std::istrstream is((char*)paramString);
|
||||
std::istrstream is((char*)paramString);
|
||||
is >> vl;
|
||||
return vl;
|
||||
}
|
||||
@@ -48,7 +48,7 @@ G4int G4UIcmdWithAnInteger::GetNewIntValue(const char* paramString)
|
||||
G4String G4UIcmdWithAnInteger::ConvertToString(G4int intValue)
|
||||
{
|
||||
char st[20];
|
||||
G4std::ostrstream os(st,20);
|
||||
std::ostrstream os(st,20);
|
||||
os << intValue << '\0';
|
||||
G4String vl = st;
|
||||
return vl;
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4UIcmdWithoutParameter.cc,v 1.3 2001/07/11 10:01:16 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4UIcommand.cc,v 1.21 2002/12/05 16:25:34 asaim Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// $Id: G4UIcommand.cc,v 1.22 2003/06/16 16:55:43 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
|
||||
@@ -131,7 +131,7 @@ G4int G4UIcommand::DoIt(G4String parameterList)
|
||||
while(!((anotherToken=parameterToken()).isNull()))
|
||||
{
|
||||
G4int idxs = anotherToken.index("#");
|
||||
if(idxs==G4int(G4std::string::npos))
|
||||
if(idxs==G4int(std::string::npos))
|
||||
{
|
||||
aToken += " ";
|
||||
aToken += anotherToken;
|
||||
@@ -346,7 +346,7 @@ void G4UIcommand::List()
|
||||
|
||||
|
||||
#include <ctype.h> // isalpha(), toupper()
|
||||
#include "g4std/strstream"
|
||||
#include <strstream>
|
||||
|
||||
//#include "checkNewValue_debug.icc"
|
||||
//#define DEBUG 1
|
||||
@@ -368,7 +368,7 @@ TypeCheck(const char * t)
|
||||
{
|
||||
G4String aNewValue;
|
||||
char type;
|
||||
G4std::istrstream is((char*)t);
|
||||
std::istrstream is((char*)t);
|
||||
for (unsigned i=0; i< parameter.size(); i++) {
|
||||
is >> aNewValue;
|
||||
type = toupper(parameter[i]->GetParameterType());
|
||||
@@ -502,7 +502,7 @@ RangeCheck(const char* t) {
|
||||
yystype result;
|
||||
char type;
|
||||
bp = 0; // reset buffer pointer for G4UIpGetc()
|
||||
G4std::istrstream is((char*)t);
|
||||
std::istrstream is((char*)t);
|
||||
for (unsigned i=0; i< parameter.size(); i++) {
|
||||
type= toupper(parameter[i]->GetParameterType());
|
||||
switch ( type ) {
|
||||
@@ -929,7 +929,7 @@ Yylex() // reads input and returns token number, KR486
|
||||
c=='e' || c=='E' || c=='+' || c=='-');
|
||||
G4UIpUngetc(c);
|
||||
const char* t = buf;
|
||||
G4std::istrstream is((char*)t);
|
||||
std::istrstream is((char*)t);
|
||||
if ( IsInt(buf.data(),20) ) {
|
||||
is >> yylval.I;
|
||||
return CONSTINT;
|
||||
|
||||
@@ -21,13 +21,13 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4UIcommandTree.cc,v 1.11 2002/04/26 22:03:35 asaim Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// $Id: G4UIcommandTree.cc,v 1.12 2003/06/16 16:55:44 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
|
||||
#include "G4UIcommandTree.hh"
|
||||
#include "G4StateManager.hh"
|
||||
#include "g4std/fstream"
|
||||
#include <fstream>
|
||||
#include "G4ios.hh"
|
||||
|
||||
G4UIcommandTree::G4UIcommandTree()
|
||||
@@ -69,7 +69,7 @@ void G4UIcommandTree::AddNewCommand(G4UIcommand *newCommand)
|
||||
return;
|
||||
}
|
||||
G4int i = remainingPath.first('/');
|
||||
if( i == G4int(G4std::string::npos) )
|
||||
if( i == G4int(std::string::npos) )
|
||||
{
|
||||
// Find command
|
||||
G4int n_commandEntry = command.size();
|
||||
@@ -114,7 +114,7 @@ void G4UIcommandTree::RemoveCommand(G4UIcommand *aCommand)
|
||||
else
|
||||
{
|
||||
G4int i = remainingPath.first('/');
|
||||
if( i == G4int(G4std::string::npos) )
|
||||
if( i == G4int(std::string::npos) )
|
||||
{
|
||||
// Find command
|
||||
G4int n_commandEntry = command.size();
|
||||
@@ -155,11 +155,11 @@ void G4UIcommandTree::RemoveCommand(G4UIcommand *aCommand)
|
||||
G4UIcommand * G4UIcommandTree::FindPath(const char* commandPath)
|
||||
{
|
||||
G4String remainingPath = commandPath;
|
||||
if( remainingPath.index( pathName ) == G4std::string::npos )
|
||||
if( remainingPath.index( pathName ) == std::string::npos )
|
||||
{ return NULL; }
|
||||
remainingPath.remove(0,pathName.length());
|
||||
G4int i = remainingPath.first('/');
|
||||
if( i == G4int(G4std::string::npos) )
|
||||
if( i == G4int(std::string::npos) )
|
||||
{
|
||||
// Find command
|
||||
G4int n_commandEntry = command.size();
|
||||
@@ -246,7 +246,7 @@ G4String G4UIcommandTree::CreateFileName(const char* pName)
|
||||
{
|
||||
G4String fn = pName;
|
||||
G4int idxs;
|
||||
while((idxs=fn.index("/"))!=G4int(G4std::string::npos))
|
||||
while((idxs=fn.index("/"))!=G4int(std::string::npos))
|
||||
{ fn(idxs) = '_'; }
|
||||
fn += ".html";
|
||||
return fn;
|
||||
@@ -277,7 +277,7 @@ G4String G4UIcommandTree::ModStr(const char* strS)
|
||||
void G4UIcommandTree::CreateHTML()
|
||||
{
|
||||
G4String ofileName = CreateFileName(pathName);
|
||||
G4std::ofstream oF(ofileName, G4std::ios::out);
|
||||
std::ofstream oF(ofileName, std::ios::out);
|
||||
|
||||
oF << "<html><head><title>Commands in " << ModStr(pathName) << "</title></head>" << G4endl;
|
||||
oF << "<body bgcolor=\"#ffffff\"><h2>" << ModStr(pathName) << "</h2><p>" << G4endl;
|
||||
@@ -317,7 +317,7 @@ void G4UIcommandTree::CreateHTML()
|
||||
{ oF << ModStr(cmd->GetGuidanceLine(i)) << "<br>" << G4endl; }
|
||||
if(!(cmd->GetRange()).isNull())
|
||||
{ oF << "<p><dd>Range : " << ModStr(cmd->GetRange()) << G4endl; }
|
||||
G4std::vector<G4ApplicationState>* availabelStateList = cmd->GetStateList();
|
||||
std::vector<G4ApplicationState>* availabelStateList = cmd->GetStateList();
|
||||
if(availabelStateList->size()==6)
|
||||
{ oF << "<p><dd>Available at all Geant4 states." << G4endl; }
|
||||
else
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4UIcontrolMessenger.cc,v 1.9 2002/05/15 06:51:32 asaim Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4UIdirectory.cc,v 1.3 2001/07/11 10:01:16 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4UImanager.cc,v 1.27 2002/12/04 18:30:43 asaim Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// $Id: G4UImanager.cc,v 1.29 2003/06/16 16:55:45 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
// ---------------------------------------------------------------------
|
||||
@@ -40,7 +40,7 @@
|
||||
#include "G4UIaliasList.hh"
|
||||
#include "G4Tokenizer.hh"
|
||||
|
||||
#include "g4std/strstream"
|
||||
#include <strstream>
|
||||
|
||||
|
||||
G4UImanager * G4UImanager::fUImanager = 0;
|
||||
@@ -95,13 +95,14 @@ G4UImanager::~G4UImanager()
|
||||
fUImanager = NULL;
|
||||
}
|
||||
|
||||
G4UImanager::G4UImanager(const G4UImanager &right) { }
|
||||
G4UImanager::G4UImanager(const G4UImanager &)
|
||||
:G4VStateDependent(true) {;}
|
||||
const G4UImanager & G4UImanager::operator=(const G4UImanager &right)
|
||||
{ return right; }
|
||||
G4int G4UImanager::operator==(const G4UImanager &right) const
|
||||
{ return false; }
|
||||
{ return (this==&right); }
|
||||
G4int G4UImanager::operator!=(const G4UImanager &right) const
|
||||
{ return true; }
|
||||
{ return (this!=&right); }
|
||||
|
||||
G4String G4UImanager::GetCurrentValues(const char * aCommand)
|
||||
{
|
||||
@@ -160,7 +161,7 @@ const char * aParameterName, G4bool reGet)
|
||||
GetCurrentStringValue( aCommand, aParameterName, reGet );
|
||||
G4int value;
|
||||
const char* t = targetParameter;
|
||||
G4std::istrstream is((char*)t);
|
||||
std::istrstream is((char*)t);
|
||||
is >> value;
|
||||
return value;
|
||||
}
|
||||
@@ -172,7 +173,7 @@ G4int parameterNumber, G4bool reGet)
|
||||
GetCurrentStringValue( aCommand, parameterNumber, reGet );
|
||||
G4int value;
|
||||
const char* t = targetParameter;
|
||||
G4std::istrstream is((char*)t);
|
||||
std::istrstream is((char*)t);
|
||||
is >> value;
|
||||
return value;
|
||||
}
|
||||
@@ -184,7 +185,7 @@ const char * aParameterName, G4bool reGet)
|
||||
GetCurrentStringValue( aCommand, aParameterName, reGet );
|
||||
G4double value;
|
||||
const char* t = targetParameter;
|
||||
G4std::istrstream is((char*)t);
|
||||
std::istrstream is((char*)t);
|
||||
is >> value;
|
||||
return value;
|
||||
}
|
||||
@@ -196,7 +197,7 @@ G4int parameterNumber, G4bool reGet)
|
||||
GetCurrentStringValue( aCommand, parameterNumber, reGet );
|
||||
G4double value;
|
||||
const char* t = targetParameter;
|
||||
G4std::istrstream is((char*)t);
|
||||
std::istrstream is((char*)t);
|
||||
is >> value;
|
||||
return value;
|
||||
}
|
||||
@@ -232,7 +233,7 @@ void G4UImanager::LoopS(const char* valueList)
|
||||
c1 += " ";
|
||||
c1 += parameterToken();
|
||||
const char* t1 = c1;
|
||||
G4std::istrstream is((char*)t1);
|
||||
std::istrstream is((char*)t1);
|
||||
G4double d1;
|
||||
G4double d2;
|
||||
G4double d3;
|
||||
@@ -247,7 +248,7 @@ void G4UImanager::Loop(const char * macroFile,const char * variableName,
|
||||
for(G4double d=initialValue;d<=finalValue;d+=stepSize)
|
||||
{
|
||||
char st[20];
|
||||
G4std::ostrstream os(st,20);
|
||||
std::ostrstream os(st,20);
|
||||
os << d << '\0';
|
||||
cd += st;
|
||||
cd += " ";
|
||||
@@ -293,13 +294,13 @@ G4String G4UImanager::SolveAlias(const char* aCmd)
|
||||
G4String aCommand = aCmd;
|
||||
G4int ia = aCommand.index("{");
|
||||
G4int iz = aCommand.index("#");
|
||||
while((ia != G4int(G4std::string::npos))&&((iz==G4int(G4std::string::npos))||(ia<iz)))
|
||||
while((ia != G4int(std::string::npos))&&((iz==G4int(std::string::npos))||(ia<iz)))
|
||||
{
|
||||
G4int ibx = -1;
|
||||
while(ibx<0)
|
||||
{
|
||||
G4int ib = aCommand.index("}");
|
||||
if( ib == G4int(G4std::string::npos) )
|
||||
if( ib == G4int(std::string::npos) )
|
||||
{
|
||||
G4cerr << aCommand << G4endl;
|
||||
for(G4int iz=0;iz<ia;iz++) G4cerr << " ";
|
||||
@@ -310,7 +311,7 @@ G4String G4UImanager::SolveAlias(const char* aCmd)
|
||||
G4String ps = aCommand(ia+1,aCommand.length()-(ia+1));
|
||||
G4int ic = ps.index("{");
|
||||
G4int id = ps.index("}");
|
||||
if(ic!=G4int(G4std::string::npos) && ic < id)
|
||||
if(ic!=G4int(std::string::npos) && ic < id)
|
||||
{ ia+=ic+1; }
|
||||
else
|
||||
{ ibx = ib; }
|
||||
@@ -349,7 +350,7 @@ G4int G4UImanager::ApplyCommand(const char * aCmd)
|
||||
G4String commandParameter;
|
||||
|
||||
G4int i = aCommand.index(" ");
|
||||
if( i != G4int(G4std::string::npos) )
|
||||
if( i != G4int(std::string::npos) )
|
||||
{
|
||||
commandString = aCommand(0,i);
|
||||
commandParameter = aCommand(i+1,aCommand.length()-(i+1));
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4UImessenger.cc,v 1.3 2001/07/11 10:01:16 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// $Id: G4UImessenger.cc,v 1.5 2003/06/16 16:55:46 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
|
||||
#include "G4UImessenger.hh"
|
||||
@@ -31,20 +31,20 @@
|
||||
#include <string.h>
|
||||
#include "G4ios.hh"
|
||||
|
||||
#include "g4std/strstream"
|
||||
#include <strstream>
|
||||
|
||||
|
||||
G4UImessenger::G4UImessenger() { }
|
||||
|
||||
G4UImessenger::~G4UImessenger() { }
|
||||
|
||||
G4String G4UImessenger::GetCurrentValue(G4UIcommand * command)
|
||||
G4String G4UImessenger::GetCurrentValue(G4UIcommand*)
|
||||
{
|
||||
G4String nullString;
|
||||
return nullString;
|
||||
}
|
||||
|
||||
void G4UImessenger::SetNewValue(G4UIcommand * command,G4String newValue)
|
||||
void G4UImessenger::SetNewValue(G4UIcommand*,G4String)
|
||||
{ ; }
|
||||
|
||||
G4bool G4UImessenger::operator == (const G4UImessenger& messenger) const {
|
||||
@@ -54,7 +54,7 @@ G4bool G4UImessenger::operator == (const G4UImessenger& messenger) const {
|
||||
G4String G4UImessenger::ItoS(G4int i)
|
||||
{
|
||||
char defVal[20];
|
||||
G4std::ostrstream os(defVal,20);
|
||||
std::ostrstream os(defVal,20);
|
||||
os << i << '\0';
|
||||
return G4String(defVal);
|
||||
}
|
||||
@@ -62,7 +62,7 @@ G4String G4UImessenger::ItoS(G4int i)
|
||||
G4String G4UImessenger::DtoS(G4double a)
|
||||
{
|
||||
char defVal[40];
|
||||
G4std::ostrstream os(defVal,40);
|
||||
std::ostrstream os(defVal,40);
|
||||
os << a << '\0';
|
||||
return G4String(defVal);
|
||||
}
|
||||
@@ -78,7 +78,7 @@ G4int G4UImessenger::StoI(G4String s)
|
||||
{
|
||||
G4int vl;
|
||||
const char* t = s;
|
||||
G4std::istrstream is((char*)t);
|
||||
std::istrstream is((char*)t);
|
||||
is >> vl;
|
||||
return vl;
|
||||
}
|
||||
@@ -87,7 +87,7 @@ G4double G4UImessenger::StoD(G4String s)
|
||||
{
|
||||
G4double vl;
|
||||
const char* t = s;
|
||||
G4std::istrstream is((char*)t);
|
||||
std::istrstream is((char*)t);
|
||||
is >> vl;
|
||||
return vl;
|
||||
}
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4UIparameter.cc,v 1.11 2002/04/26 22:03:35 asaim Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// $Id: G4UIparameter.cc,v 1.12 2003/06/16 16:55:47 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
|
||||
#include "G4UIparameter.hh"
|
||||
@@ -109,7 +109,7 @@ void G4UIparameter::List()
|
||||
void G4UIparameter::SetDefaultValue(G4int theDefaultValue)
|
||||
{
|
||||
char defVal[20];
|
||||
G4std::ostrstream os(defVal,20);
|
||||
std::ostrstream os(defVal,20);
|
||||
os << theDefaultValue << '\0';
|
||||
defaultValue = defVal;
|
||||
}
|
||||
@@ -117,7 +117,7 @@ void G4UIparameter::SetDefaultValue(G4int theDefaultValue)
|
||||
void G4UIparameter::SetDefaultValue(G4double theDefaultValue)
|
||||
{
|
||||
char defVal[20];
|
||||
G4std::ostrstream os(defVal,20);
|
||||
std::ostrstream os(defVal,20);
|
||||
os << theDefaultValue << '\0';
|
||||
defaultValue = defVal;
|
||||
}
|
||||
@@ -158,7 +158,7 @@ G4int G4UIparameter::
|
||||
RangeCheck(const char* newValue) {
|
||||
yystype result;
|
||||
bp = 0; // reset buffer pointer for G4UIpGetc()
|
||||
G4std::istrstream is((char*)newValue);
|
||||
std::istrstream is((char*)newValue);
|
||||
char type = toupper( parameterType );
|
||||
switch (type) {
|
||||
case 'D': { is >> newVal.D; } break;
|
||||
@@ -217,7 +217,7 @@ TypeCheck(const char* newValue)
|
||||
|
||||
|
||||
G4int G4UIparameter::
|
||||
IsInt(const char* buf, short maxDigits) // do not allow any G4std::ws
|
||||
IsInt(const char* buf, short maxDigits) // do not allow any std::ws
|
||||
{
|
||||
const char* p= buf;
|
||||
G4int length=0;
|
||||
@@ -674,7 +674,7 @@ Yylex() // reads input and returns token number KR486
|
||||
c=='e' || c=='E' || c=='+' || c=='-');
|
||||
G4UIpUngetc(c);
|
||||
const char* t = buf;
|
||||
G4std::istrstream is((char*)t);
|
||||
std::istrstream is((char*)t);
|
||||
if ( IsInt(buf.data(),20) ) {
|
||||
is >> yylval.I;
|
||||
return CONSTINT;
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4UIsession.cc,v 1.4 2001/07/11 10:01:17 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// $Id: G4UIsession.cc,v 1.6 2003/06/16 16:55:48 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
// ---------------------------------------------------------------------
|
||||
@@ -35,16 +35,16 @@ G4UIsession::~G4UIsession() {;}
|
||||
|
||||
G4UIsession * G4UIsession::SessionStart() { return NULL; }
|
||||
|
||||
void G4UIsession::PauseSessionStart(G4String Prompt) {;}
|
||||
void G4UIsession::PauseSessionStart(G4String) {;}
|
||||
|
||||
G4int G4UIsession::ReceiveG4cout(G4String coutString)
|
||||
{
|
||||
G4std::cout << coutString << G4std::flush;
|
||||
std::cout << coutString << std::flush;
|
||||
return 0;
|
||||
}
|
||||
|
||||
G4int G4UIsession::ReceiveG4cerr(G4String cerrString)
|
||||
{
|
||||
G4std::cerr << cerrString << G4std::flush;
|
||||
std::cerr << cerrString << std::flush;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4UnitsMessenger.cc,v 1.4 2002/12/04 18:30:43 asaim Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// $Id: G4UnitsMessenger.cc,v 1.5 2003/05/21 21:13:30 asaim Exp $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
|
||||
@@ -57,7 +57,7 @@ G4UnitsMessenger::~G4UnitsMessenger()
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
|
||||
|
||||
void G4UnitsMessenger::SetNewValue(G4UIcommand* command,G4String newValue)
|
||||
void G4UnitsMessenger::SetNewValue(G4UIcommand* command,G4String)
|
||||
{
|
||||
if (command == ListCmd)
|
||||
{ G4UnitDefinition::PrintUnitsTable(); }
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4VGlobalFastSimulationManager.cc,v 1.4 2002/11/20 14:46:01 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
// Abstract interface for GEANT4 Global Fast Simulation Manager.
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//
|
||||
//
|
||||
// $Id: G4VVisManager.cc,v 1.5 2002/11/20 14:46:01 gcosmo Exp $
|
||||
// GEANT4 tag $Name: geant4-05-01 $
|
||||
// GEANT4 tag $Name: geant4-05-02 $
|
||||
//
|
||||
//
|
||||
// Abstract interface for GEANT4 Visualization Manager.
|
||||
|
||||
Reference in New Issue
Block a user