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

Import Geant4 1.1.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-08 15:34:16 +02:00
parent ca1c8cb059
commit 103bda00c8
2654 changed files with 29719 additions and 20203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/intercoms/History
+4 -1
View File
@@ -1,4 +1,4 @@
$Id: History,v 1.11 1999/11/23 17:09:26 johna Exp $
$Id: History,v 1.12 2000/02/14 08:41:21 asaim Exp $
-------------------------------------------------------------------
=========================================================
@@ -17,6 +17,9 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
Feb 14, 00, M.Asai (tag intercoms-V01-00-00)
- Put "const" to "char *" arguments in G4UImanager
Nov 23, 99, J.Allison (tag intercoms-V00-01-02)
- Tagged changes for Software Reference Manual on behalf of Makoto Asai.
source/intercoms/include/G4ApplicationState.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: G4ApplicationState.hh,v 1.2.4.1 1999/12/07 20:48:58 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4ApplicationState.hh,v 1.3 1999/12/15 14:50:37 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
#ifndef G4APPLICATIONSTATE_H
source/intercoms/include/G4StateManager.hh
+3 -3
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4StateManager.hh,v 1.3.2.1 1999/12/07 20:48:58 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4StateManager.hh,v 1.5 2000/02/14 12:24:41 asaim Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
// ------------------------------------------------------------
@@ -73,7 +73,7 @@ public: // with description
G4String GetStateString(G4ApplicationState aState);
// A utility method which returns a string of the state name.
void Pause();
void Pause(char* msg);
void Pause(const char* msg);
void Pause(G4String msg);
// G4UIsession::pauseSession() will be invoked. The argument string "msg"
// will be used as a prompt characters if the session is non-graphical.
source/intercoms/include/G4UIbatch.hh
+4 -4
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4UIbatch.hh,v 1.2.4.1 1999/12/07 20:48:58 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4UIbatch.hh,v 1.3 1999/12/15 14:50:38 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
// $id$
@@ -15,7 +15,7 @@
#include "globals.hh"
#include "G4UIsession.hh"
#include <fstream.h>
#include "g4std/fstream"
class G4UImanager;
@@ -45,7 +45,7 @@ class G4UIbatch : public G4UIsession
private:
G4UImanager * UImanager;
G4UIsession * previousSession;
ifstream macroFile;
G4std::ifstream macroFile;
G4String macroFileName;
G4bool openFailed;
};
source/intercoms/include/G4UIcmdWith3Vector.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: G4UIcmdWith3Vector.hh,v 1.2.4.1 1999/12/07 20:48:58 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4UIcmdWith3Vector.hh,v 1.3 1999/12/15 14:50:38 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
source/intercoms/include/G4UIcmdWith3VectorAndUnit.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: G4UIcmdWith3VectorAndUnit.hh,v 1.2.4.1 1999/12/07 20:48:58 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4UIcmdWith3VectorAndUnit.hh,v 1.3 1999/12/15 14:50:38 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
source/intercoms/include/G4UIcmdWithABool.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: G4UIcmdWithABool.hh,v 1.2.4.1 1999/12/07 20:48:58 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4UIcmdWithABool.hh,v 1.3 1999/12/15 14:50:38 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
source/intercoms/include/G4UIcmdWithADouble.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: G4UIcmdWithADouble.hh,v 1.2.4.1 1999/12/07 20:48:59 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4UIcmdWithADouble.hh,v 1.3 1999/12/15 14:50:38 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
source/intercoms/include/G4UIcmdWithADoubleAndUnit.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: G4UIcmdWithADoubleAndUnit.hh,v 1.2.4.1 1999/12/07 20:48:59 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4UIcmdWithADoubleAndUnit.hh,v 1.3 1999/12/15 14:50:38 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
source/intercoms/include/G4UIcmdWithAString.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: G4UIcmdWithAString.hh,v 1.2.4.1 1999/12/07 20:48:59 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4UIcmdWithAString.hh,v 1.3 1999/12/15 14:50:38 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
source/intercoms/include/G4UIcmdWithAnInteger.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: G4UIcmdWithAnInteger.hh,v 1.2.4.1 1999/12/07 20:48:59 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4UIcmdWithAnInteger.hh,v 1.3 1999/12/15 14:50:39 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
source/intercoms/include/G4UIcmdWithoutParameter.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: G4UIcmdWithoutParameter.hh,v 1.2.4.1 1999/12/07 20:48:59 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4UIcmdWithoutParameter.hh,v 1.3 1999/12/15 14:50:39 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
source/intercoms/include/G4UIcommand.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: G4UIcommand.hh,v 1.4.2.1 1999/12/07 20:48:59 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4UIcommand.hh,v 1.5 1999/12/15 14:50:39 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
source/intercoms/include/G4UIcommandStatus.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: G4UIcommandStatus.hh,v 1.1.10.1 1999/12/07 20:49:00 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4UIcommandStatus.hh,v 1.2 1999/12/15 14:50:39 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
#ifndef G4UIcommandStatus_h
source/intercoms/include/G4UIcommandTree.hh
+3 -3
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4UIcommandTree.hh,v 1.3.2.1 1999/12/07 20:49:00 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4UIcommandTree.hh,v 1.5 2000/02/14 12:24:41 asaim Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
#ifndef G4UIcommandTree_h
@@ -28,7 +28,7 @@ class G4UIcommandTree
public:
G4UIcommandTree();
G4UIcommandTree(G4String thePathName);
G4UIcommandTree(char * thePathName);
G4UIcommandTree(const char * thePathName);
~G4UIcommandTree();
int operator==(const G4UIcommandTree &right) const;
int operator!=(const G4UIcommandTree &right) const;
source/intercoms/include/G4UIcontrolMessenger.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: G4UIcontrolMessenger.hh,v 1.2.4.1 1999/12/07 20:49:00 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4UIcontrolMessenger.hh,v 1.3 1999/12/15 14:50:39 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
#ifndef G4UIcontrolMessenger_h
source/intercoms/include/G4UIdirectory.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: G4UIdirectory.hh,v 1.2.4.1 1999/12/07 20:49:00 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4UIdirectory.hh,v 1.3 1999/12/15 14:50:39 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
source/intercoms/include/G4UImanager.hh
+6 -6
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4UImanager.hh,v 1.3.2.1 1999/12/07 20:49:00 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4UImanager.hh,v 1.5 2000/02/14 08:41:24 asaim Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
#ifndef G4UImanager_h
@@ -15,7 +15,7 @@
#include "globals.hh"
#include "g4rw/ctoken.h"
#include "g4rw/tvordvec.h"
#include <fstream.h>
#include "g4std/fstream"
class G4UIcommandTree;
class G4UIcommand;
class G4UIsession;
@@ -59,7 +59,7 @@ class G4UImanager
// command, that particular command cannot be applied.
void ExecuteMacroFile(G4String fileName);
// A macro file defined by the argument will be read by G4UIbatch object.
G4int ApplyCommand(char * aCommand);
G4int ApplyCommand(const char * aCommand);
G4int ApplyCommand(G4String aCommand);
// These two methods are identical. A command (and parameter(s)) given
// by the method's argument will be applied. Zero will be returned in
@@ -88,7 +88,7 @@ class G4UImanager
public:
// following three methods will be removed quite soon.
void Interact();
void Interact(char * promptCharacters);
void Interact(const char * promptCharacters);
void Interact(G4String promptCharacters);
private:
@@ -101,7 +101,7 @@ class G4UImanager
G4String savedParameters;
G4UIcommand * savedCommand;
G4int verboseLevel;
ofstream historyFile;
G4std::ofstream historyFile;
G4bool saveHistory;
G4RWTValOrderedVector<G4String> histVec;
source/intercoms/include/G4UImessenger.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: G4UImessenger.hh,v 1.3.2.1 1999/12/07 20:49:00 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4UImessenger.hh,v 1.4 1999/12/15 14:50:39 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
#ifndef G4UImessenger_h
source/intercoms/include/G4UIparameter.hh
+3 -7
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4UIparameter.hh,v 1.2.4.1 1999/12/07 20:49:00 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4UIparameter.hh,v 1.3 1999/12/15 14:50:39 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
// ---------------------------------------------------------------------
@@ -16,11 +16,7 @@
#include "globals.hh"
#ifdef WIN32
# include <Strstrea.h>
#else
# include <strstream.h>
#endif
#include "g4std/strstream"
#include "G4UItokenNum.hh"
source/intercoms/include/G4UIsession.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: G4UIsession.hh,v 1.2.4.1 1999/12/07 20:49:00 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4UIsession.hh,v 1.3 1999/12/15 14:50:39 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
// $id$
source/intercoms/include/G4UItokenNum.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: G4UItokenNum.hh,v 1.1.10.1 1999/12/07 20:49:00 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4UItokenNum.hh,v 1.2 1999/12/15 14:50:39 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
// G4UItokenNum.hh
source/intercoms/include/G4UnitsMessenger.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: G4UnitsMessenger.hh,v 1.2.2.1 1999/12/07 20:49:01 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4UnitsMessenger.hh,v 1.3 1999/12/15 14:50:40 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
// class description
//
source/intercoms/include/G4VFlavoredParallelWorld.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: G4VFlavoredParallelWorld.hh,v 1.1.8.1 1999/12/07 20:49:01 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4VFlavoredParallelWorld.hh,v 1.2 1999/12/15 14:50:40 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
// Abstract interface for GEANT4 Flavored Parallel World.
source/intercoms/include/G4VGlobalFastSimulationManager.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: G4VGlobalFastSimulationManager.hh,v 1.1.8.1 1999/12/07 20:49:01 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4VGlobalFastSimulationManager.hh,v 1.2 1999/12/15 14:50:40 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
// Abstract interface for GEANT4 Global Fast Simulation Manager.
source/intercoms/include/G4VGraphicsScene.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: G4VGraphicsScene.hh,v 1.3.4.1 1999/12/07 20:49:01 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4VGraphicsScene.hh,v 1.4 1999/12/15 14:50:40 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
// John Allison 19th July 1996
//
// Class Description:
source/intercoms/include/G4VStateDependent.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: G4VStateDependent.hh,v 1.2.4.1 1999/12/07 20:49:01 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4VStateDependent.hh,v 1.3 1999/12/15 14:50:40 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
// ------------------------------------------------------------
source/intercoms/include/G4VVisManager.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: G4VVisManager.hh,v 1.3.4.1 1999/12/07 20:49:01 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4VVisManager.hh,v 1.4 1999/12/15 14:50:40 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
// John Allison 19/Oct/1996.
//
// Class Description:
source/intercoms/src/G4StateManager.cc
+3 -3
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4StateManager.cc,v 1.1.10.1 1999/12/07 20:49:01 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4StateManager.cc,v 1.3 2000/02/14 12:24:42 asaim Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
// ------------------------------------------------------------
@@ -139,7 +139,7 @@ void G4StateManager::Pause()
Pause("G4_pause> ");
}
void G4StateManager::Pause(char* msg)
void G4StateManager::Pause(const char* msg)
{
G4String msgS = msg;
Pause(msgS);
source/intercoms/src/G4UIbatch.cc
+7 -7
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4UIbatch.cc,v 1.1.10.1 1999/12/07 20:49:02 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4UIbatch.cc,v 1.2 1999/12/15 14:50:40 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
#include "G4UIbatch.hh"
@@ -24,7 +24,7 @@ G4UIbatch::G4UIbatch(G4String fileName,G4UIsession* prevSession)
if(macroFile.fail())
{
G4cerr << "macro file <" << fileName << "> could not open."
<< endl;
<< G4endl;
openFailed = true;
}
}
@@ -46,7 +46,7 @@ G4UIsession * G4UIbatch::SessionStart()
macroFile.getline( commandLine, lineLength );
if( macroFile.bad() )
{
G4cout << "Cannot read " << macroFileName << "." << endl;
G4cout << "Cannot read " << macroFileName << "." << G4endl;
break;
}
if( macroFile.eof() ) break;
@@ -54,7 +54,7 @@ G4UIsession * G4UIbatch::SessionStart()
if( commandLine[0] != '#' )
{ UImanager->ApplyCommand(commandLine); }
else
{ G4cout << commandLine << endl; }
{ G4cout << commandLine << G4endl; }
}
}
return previousSession;
@@ -62,9 +62,9 @@ G4UIsession * G4UIbatch::SessionStart()
void G4UIbatch::PauseSessionStart(G4String Prompt)
{
G4cout << "Pause session <" << Prompt << "> start." << endl;
G4cout << "Pause session <" << Prompt << "> start." << G4endl;
SessionStart();
G4cout << "Pause session <" << Prompt << "> Terminate." << endl;
G4cout << "Pause session <" << Prompt << "> Terminate." << G4endl;
}
source/intercoms/src/G4UIcmdWith3Vector.cc
+5 -9
View File
@@ -5,17 +5,13 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4UIcmdWith3Vector.cc,v 1.1.10.1 1999/12/07 20:49:02 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4UIcmdWith3Vector.cc,v 1.2 1999/12/15 14:50:41 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
#include "G4UIcmdWith3Vector.hh"
#ifdef WIN32
# include <Strstrea.h>
#else
# include <strstream.h>
#endif
#include "g4std/strstream"
G4UIcmdWith3Vector::G4UIcmdWith3Vector
(const char * theCommandPath,G4UImessenger * theMessenger)
@@ -35,7 +31,7 @@ G4ThreeVector G4UIcmdWith3Vector::GetNew3VectorValue(G4String paramString)
G4double vy;
G4double vz;
const char* t = paramString;
istrstream is((char*)t);
G4std::istrstream is((char*)t);
is >> vx >> vy >> vz;
return G4ThreeVector(vx,vy,vz);
}
@@ -43,7 +39,7 @@ G4ThreeVector G4UIcmdWith3Vector::GetNew3VectorValue(G4String paramString)
G4String G4UIcmdWith3Vector::ConvertToString(G4ThreeVector vec)
{
char st[100];
ostrstream os(st,100);
G4std::ostrstream os(st,100);
os << vec.x() << " " << vec.y() << " " << vec.z() << '\0';
G4String vl = st;
return vl;
source/intercoms/src/G4UIcmdWith3VectorAndUnit.cc
+7 -11
View File
@@ -5,17 +5,13 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4UIcmdWith3VectorAndUnit.cc,v 1.1.10.1 1999/12/07 20:49:02 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4UIcmdWith3VectorAndUnit.cc,v 1.2 1999/12/15 14:50:41 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
#include "G4UIcmdWith3VectorAndUnit.hh"
#ifdef WIN32
# include <Strstrea.h>
#else
# include <strstream.h>
#endif
#include "g4std/strstream"
G4UIcmdWith3VectorAndUnit::G4UIcmdWith3VectorAndUnit
(const char * theCommandPath,G4UImessenger * theMessenger)
@@ -39,7 +35,7 @@ G4ThreeVector G4UIcmdWith3VectorAndUnit::GetNew3VectorValue(G4String paramString
G4double vz;
char unts[30];
const char* t = paramString;
istrstream is((char*)t);
G4std::istrstream is((char*)t);
is >> vx >> vy >> vz >> unts;
G4String unt = unts;
G4double uv = ValueOf(unt);
@@ -53,7 +49,7 @@ G4ThreeVector G4UIcmdWith3VectorAndUnit::GetNew3VectorRawValue(G4String paramStr
G4double vz;
char unts[30];
const char* t = paramString;
istrstream is((char*)t);
G4std::istrstream is((char*)t);
is >> vx >> vy >> vz >> unts;
return G4ThreeVector(vx,vy,vz);
}
@@ -65,7 +61,7 @@ G4double G4UIcmdWith3VectorAndUnit::GetNewUnitValue(G4String paramString)
G4double vz;
char unts[30];
const char* t = paramString;
istrstream is((char*)t);
G4std::istrstream is((char*)t);
is >> vx >> vy >> vz >> unts;
G4String unt = unts;
return ValueOf(unt);
@@ -78,7 +74,7 @@ G4String G4UIcmdWith3VectorAndUnit::ConvertToString
G4double uv = ValueOf(unitName);
char st[100];
ostrstream os(st,100);
G4std::ostrstream os(st,100);
os << vec.x()/uv << " " << vec.y()/uv << " " << vec.z()/uv
<< " " << unitName << '\0';
G4String vl = st;
source/intercoms/src/G4UIcmdWithABool.cc
+3 -7
View File
@@ -5,17 +5,13 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4UIcmdWithABool.cc,v 1.1.10.1 1999/12/07 20:49:02 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4UIcmdWithABool.cc,v 1.2 1999/12/15 14:50:41 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
#include "G4UIcmdWithABool.hh"
#ifdef WIN32
# include <Strstrea.h>
#else
# include <strstream.h>
#endif
#include "g4std/strstream"
G4UIcmdWithABool::G4UIcmdWithABool
(const char * theCommandPath,G4UImessenger * theMessenger)
source/intercoms/src/G4UIcmdWithADouble.cc
+5 -9
View File
@@ -5,17 +5,13 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4UIcmdWithADouble.cc,v 1.1.10.1 1999/12/07 20:49:02 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4UIcmdWithADouble.cc,v 1.2 1999/12/15 14:50:41 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
#include "G4UIcmdWithADouble.hh"
#ifdef WIN32
# include <Strstrea.h>
#else
# include <strstream.h>
#endif
#include "g4std/strstream"
G4UIcmdWithADouble::G4UIcmdWithADouble
(const char * theCommandPath,G4UImessenger * theMessenger)
@@ -29,7 +25,7 @@ G4double G4UIcmdWithADouble::GetNewDoubleValue(G4String paramString)
{
G4double vl;
const char* t = paramString;
istrstream is((char*)t);
G4std::istrstream is((char*)t);
is >> vl;
return vl;
}
@@ -37,7 +33,7 @@ G4double G4UIcmdWithADouble::GetNewDoubleValue(G4String paramString)
G4String G4UIcmdWithADouble::ConvertToString(G4double dblValue)
{
char st[20];
ostrstream os(st,20);
G4std::ostrstream os(st,20);
os << dblValue << '\0';
G4String vl = st;
return vl;
source/intercoms/src/G4UIcmdWithADoubleAndUnit.cc
+7 -11
View File
@@ -5,17 +5,13 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4UIcmdWithADoubleAndUnit.cc,v 1.1.10.1 1999/12/07 20:49:02 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4UIcmdWithADoubleAndUnit.cc,v 1.2 1999/12/15 14:50:41 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
#include "G4UIcmdWithADoubleAndUnit.hh"
#ifdef WIN32
# include <Strstrea.h>
#else
# include <strstream.h>
#endif
#include "g4std/strstream"
G4UIcmdWithADoubleAndUnit::G4UIcmdWithADoubleAndUnit
(const char * theCommandPath,G4UImessenger * theMessenger)
@@ -34,7 +30,7 @@ G4double G4UIcmdWithADoubleAndUnit::GetNewDoubleValue(G4String paramString)
char unts[30];
const char* t = paramString;
istrstream is((char*)t);
G4std::istrstream is((char*)t);
is >> vl >> unts;
G4String unt = unts;
@@ -47,7 +43,7 @@ G4double G4UIcmdWithADoubleAndUnit::GetNewDoubleRawValue(G4String paramString)
char unts[30];
const char* t = paramString;
istrstream is((char*)t);
G4std::istrstream is((char*)t);
is >> vl >> unts;
return vl;
@@ -59,7 +55,7 @@ G4double G4UIcmdWithADoubleAndUnit::GetNewUnitValue(G4String paramString)
char unts[30];
const char* t = paramString;
istrstream is((char*)t);
G4std::istrstream is((char*)t);
is >> vl >> unts;
G4String unt = unts;
@@ -73,7 +69,7 @@ G4String G4UIcmdWithADoubleAndUnit::ConvertToString
G4double uv = ValueOf(unitName);
char st[50];
ostrstream os(st,50);
G4std::ostrstream os(st,50);
os << dblValue/uv << " " << unitName << '\0';
G4String vl = st;
return vl;
source/intercoms/src/G4UIcmdWithAString.cc
+3 -7
View File
@@ -5,17 +5,13 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4UIcmdWithAString.cc,v 1.1.10.1 1999/12/07 20:49:03 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4UIcmdWithAString.cc,v 1.2 1999/12/15 14:50:41 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
#include "G4UIcmdWithAString.hh"
#ifdef WIN32
# include <Strstrea.h>
#else
# include <strstream.h>
#endif
#include "g4std/strstream"
G4UIcmdWithAString::G4UIcmdWithAString
(const char * theCommandPath,G4UImessenger * theMessenger)
source/intercoms/src/G4UIcmdWithAnInteger.cc
+5 -9
View File
@@ -5,17 +5,13 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4UIcmdWithAnInteger.cc,v 1.1.10.1 1999/12/07 20:49:03 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4UIcmdWithAnInteger.cc,v 1.2 1999/12/15 14:50:41 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
#include "G4UIcmdWithAnInteger.hh"
#ifdef WIN32
# include <Strstrea.h>
#else
# include <strstream.h>
#endif
#include "g4std/strstream"
G4UIcmdWithAnInteger::G4UIcmdWithAnInteger
(const char * theCommandPath,G4UImessenger * theMessenger)
@@ -29,7 +25,7 @@ G4int G4UIcmdWithAnInteger::GetNewIntValue(G4String paramString)
{
G4int vl;
const char* t = paramString;
istrstream is((char*)t);
G4std::istrstream is((char*)t);
is >> vl;
return vl;
}
@@ -37,7 +33,7 @@ G4int G4UIcmdWithAnInteger::GetNewIntValue(G4String paramString)
G4String G4UIcmdWithAnInteger::ConvertToString(G4int intValue)
{
char st[20];
ostrstream os(st,20);
G4std::ostrstream os(st,20);
os << intValue << '\0';
G4String vl = st;
return vl;
source/intercoms/src/G4UIcmdWithoutParameter.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: G4UIcmdWithoutParameter.cc,v 1.1.10.1 1999/12/07 20:49:03 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4UIcmdWithoutParameter.cc,v 1.2 1999/12/15 14:50:41 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
source/intercoms/src/G4UIcommand.cc
+55 -59
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4UIcommand.cc,v 1.4.2.1 1999/12/07 20:49:03 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4UIcommand.cc,v 1.5 1999/12/15 14:50:41 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
@@ -30,9 +30,9 @@ G4UIcommand::G4UIcommand(const char * theCommandPath,
{ // this must be a directory
if(comStr(comStr.length()-1)!='/')
{
G4cerr << "G4UIcommand Warning : " << endl;
G4cerr << " <" << theCommandPath << "> must be a directory." << endl;
G4cerr << " '/' is appended." << endl;
G4cerr << "G4UIcommand Warning : " << G4endl;
G4cerr << " <" << theCommandPath << "> must be a directory." << G4endl;
G4cerr << " '/' is appended." << G4endl;
comStr += "/";
}
}
@@ -247,7 +247,7 @@ G4String G4UIcommand::UnitsList(G4String unitCategory)
{ if(UTbl[i]->GetName()==unitCategory) break; }
if(i==UTbl.entries())
{
G4cerr << "Unit category <" << unitCategory << "> is not defined." << endl;
G4cerr << "Unit category <" << unitCategory << "> is not defined." << G4endl;
return retStr;
}
G4UnitsContainer& UCnt = UTbl[i]->GetUnitsList();
@@ -268,34 +268,30 @@ G4String G4UIcommand::UnitsList(G4String unitCategory)
void G4UIcommand::List()
{
G4cout << endl;
G4cout << endl;
G4cout << G4endl;
G4cout << G4endl;
if(commandPath(commandPath.length()-1)!='/')
{ G4cout << "Command " << commandPath << endl; }
G4cout << "Guidance :" << endl;
{ G4cout << "Command " << commandPath << G4endl; }
G4cout << "Guidance :" << G4endl;
int n_guidanceEntry = commandGuidance.entries();
for( int i_thGuidance=0; i_thGuidance < n_guidanceEntry; i_thGuidance++ )
{ G4cout << commandGuidance[i_thGuidance] << endl; }
{ G4cout << commandGuidance[i_thGuidance] << G4endl; }
if( ! rangeString.isNull() )
{ G4cout << " Range of parameters : " << rangeString << endl; }
{ G4cout << " Range of parameters : " << rangeString << G4endl; }
int n_parameterEntry = parameter.entries();
if( n_parameterEntry > 0 )
{
for( int i_thParameter=0; i_thParameter<n_parameterEntry; i_thParameter++ )
{ parameter[i_thParameter]->List(); }
}
G4cout << endl;
G4cout << G4endl;
}
// ----- the following is used by CheckNewValue() ------------
#include <ctype.h> // isalpha(), toupper()
#ifdef WIN32
#include <strstrea.h>
#else
#include <strstream.h>
#endif
#include "g4std/strstream"
//#include "checkNewValue_debug.icc"
//#define DEBUG 1
@@ -318,7 +314,7 @@ TypeCheck(G4String newValues)
G4String aNewValue;
char type;
const char* t = newValues;
istrstream is((char*)t);
G4std::istrstream is((char*)t);
for (unsigned i=0; i< parameter.entries(); i++) {
is >> aNewValue;
type = toupper(parameter(i)->GetParameterType());
@@ -326,13 +322,13 @@ TypeCheck(G4String newValues)
case 'D':
if( IsDouble(aNewValue)==0 ){
G4cerr << aNewValue << ": double value expected."
<< endl;
<< G4endl;
return 0;
} break;
case 'I':
if( IsInt(aNewValue,20)==0 ){
G4cerr <<aNewValue<<": integer expected."
<<endl;
<<G4endl;
return 0;
} break;
case 'S':
@@ -364,15 +360,15 @@ IsInt(const char* buf, short maxDigits)
while( isdigit( (int)(*p) )) { ++p; ++length; }
if( *p == '\0' ) {
if( length > maxDigits) {
G4cerr <<"digit length exceeds"<<endl;
G4cerr <<"digit length exceeds"<<G4endl;
return 0;
}
return 1;
} else {
// G4cerr <<"illegal character after int:"<<buf<<endl;
// G4cerr <<"illegal character after int:"<<buf<<G4endl;
}
} else {
// G4cerr <<"illegal int:"<<buf<<endl;
// G4cerr <<"illegal int:"<<buf<<G4endl;
}
return 0;
}
@@ -453,7 +449,7 @@ RangeCheck(G4String newValue) {
char type;
bp = 0; // reset buffer pointer for G4UIpGetc()
const char* t = newValue;
istrstream is((char*)t);
G4std::istrstream is((char*)t);
for (unsigned i=0; i< parameter.entries(); i++) {
type= toupper(parameter(i)->GetParameterType());
switch ( type ) {
@@ -470,11 +466,11 @@ RangeCheck(G4String newValue) {
if( paramERR == 1 ) return 0;
if( result.type != CONSTINT) {
G4cerr << "Illegal Expression in parameter range." << endl;
G4cerr << "Illegal Expression in parameter range." << G4endl;
return 0;
}
if ( result.I ) return 1;
G4cerr << "parameter out of range: "<< rangeString << endl;
G4cerr << "parameter out of range: "<< rangeString << G4endl;
return 0;
}
@@ -484,7 +480,7 @@ Expression(void)
{
yystype result;
#ifdef DEBUG
G4cerr << " Expression()" << endl;
G4cerr << " Expression()" << G4endl;
#endif
result = LogicalORExpression();
return result;
@@ -498,7 +494,7 @@ LogicalORExpression(void)
p = LogicalANDExpression();
if( token != LOGICALOR) return p;
if( p.type == CONSTSTRING || p.type == IDENTIFIER ) {
G4cerr << "Parameter range: illegal type at '||'" << endl;
G4cerr << "Parameter range: illegal type at '||'" << G4endl;
paramERR = 1;
}
result.I = p.I;
@@ -507,7 +503,7 @@ LogicalORExpression(void)
token = Yylex();
p = LogicalANDExpression();
if( p.type == CONSTSTRING || p.type == IDENTIFIER ) {
G4cerr << "Parameter range: illegal type at '||'" <<endl;
G4cerr << "Parameter range: illegal type at '||'" <<G4endl;
paramERR = 1;
}
switch (p.type) {
@@ -518,7 +514,7 @@ LogicalORExpression(void)
result.I += (p.D != 0.0);
result.type = CONSTINT; break;
default:
G4cerr << "Parameter range: unknown type"<<endl;
G4cerr << "Parameter range: unknown type"<<G4endl;
paramERR = 1;
}
}
@@ -533,7 +529,7 @@ LogicalANDExpression(void)
p = EqualityExpression();
if( token != LOGICALAND) return p;
if( p.type == CONSTSTRING || p.type == IDENTIFIER ) {
G4cerr << "Parameter range: illegal type at '&&'" << endl;
G4cerr << "Parameter range: illegal type at '&&'" << G4endl;
paramERR = 1;
}
result.I = p.I;
@@ -542,7 +538,7 @@ LogicalANDExpression(void)
token = Yylex();
p = EqualityExpression();
if( p.type == CONSTSTRING || p.type == IDENTIFIER ) {
G4cerr << "Parameter range: illegal type at '&&'" << endl;
G4cerr << "Parameter range: illegal type at '&&'" << G4endl;
paramERR = 1;
}
switch (p.type) {
@@ -553,7 +549,7 @@ LogicalANDExpression(void)
result.I *= (p.D != 0.0);
result.type = CONSTINT; break;
default:
G4cerr << "Parameter range: unknown type."<< endl;
G4cerr << "Parameter range: unknown type."<< G4endl;
paramERR = 1;
}
}
@@ -568,7 +564,7 @@ EqualityExpression(void)
int operat;
yystype result;
#ifdef DEBUG
G4cerr << " EqualityExpression()" <<endl;
G4cerr << " EqualityExpression()" <<G4endl;
#endif
result = RelationalExpression();
if( token==EQ || token==NE ) {
@@ -579,12 +575,12 @@ EqualityExpression(void)
result.I = Eval2( arg1, operat, arg2 ); // semantic action
result.type = CONSTINT;
#ifdef DEBUG
G4cerr << " return code of Eval2(): " << result.I <<endl;
G4cerr << " return code of Eval2(): " << result.I <<G4endl;
#endif
} else {
if (result.type != CONSTINT && result.type != CONSTDOUBLE) {
G4cerr << "Parameter range: error at EqualityExpression"
<< endl;
<< G4endl;
paramERR = 1;
}
}
@@ -599,7 +595,7 @@ RelationalExpression(void)
int operat;
yystype result;
#ifdef DEBUG
G4cerr << " RelationalExpression()" <<endl;
G4cerr << " RelationalExpression()" <<G4endl;
#endif
arg1 = AdditiveExpression();
@@ -610,13 +606,13 @@ RelationalExpression(void)
result.I = Eval2( arg1, operat, arg2 ); // semantic action
result.type = CONSTINT;
#ifdef DEBUG
G4cerr << " return code of Eval2(): " << result.I << endl;
G4cerr << " return code of Eval2(): " << result.I << G4endl;
#endif
} else {
result = arg1;
}
#ifdef DEBUG
G4cerr <<" return RelationalExpression()"<< endl;
G4cerr <<" return RelationalExpression()"<< G4endl;
#endif
return result;
}
@@ -628,7 +624,7 @@ AdditiveExpression(void)
if( token != '+' && token != '-' ) return result;
G4cerr << "Parameter range: operator "
<< (char)token
<< " is not supported." << endl;
<< " is not supported." << G4endl;
paramERR = 1;
return result;
}
@@ -640,7 +636,7 @@ MultiplicativeExpression(void)
if( token != '*' && token != '/' && token != '%' ) return result;
G4cerr << "Parameter range: operator "
<< (char)token
<< " is not supported." << endl;
<< " is not supported." << G4endl;
paramERR = 1;
return result;
}
@@ -651,7 +647,7 @@ UnaryExpression(void)
yystype result;
yystype p;
#ifdef DEBUG
G4cerr <<" UnaryExpression"<< endl;
G4cerr <<" UnaryExpression"<< G4endl;
#endif
switch(token) {
case '-':
@@ -672,7 +668,7 @@ UnaryExpression(void)
token = Yylex();
G4cerr << "Parameter range error: "
<< "operator '!' is not supported (sorry)."
<< endl;
<< G4endl;
paramERR = 1;
result = UnaryExpression(); break;
default:
@@ -687,7 +683,7 @@ PrimaryExpression(void)
{
yystype result;
#ifdef DEBUG
G4cerr <<" primary_exp"<<endl;
G4cerr <<" primary_exp"<<G4endl;
#endif
switch (token) {
case IDENTIFIER:
@@ -706,7 +702,7 @@ PrimaryExpression(void)
token= Yylex();
result = Expression();
if( token != ')' ) {
G4cerr << " ')' expected" << endl;
G4cerr << " ')' expected" << G4endl;
paramERR = 1;
}
token = Yylex();
@@ -726,7 +722,7 @@ Eval2(yystype arg1, int op, yystype arg2)
if( (arg1.type != IDENTIFIER) && (arg2.type != IDENTIFIER)) {
G4cerr << commandName
<< ": meaningless comparison"
<< endl;
<< G4endl;
paramERR = 1;
}
@@ -740,7 +736,7 @@ Eval2(yystype arg1, int op, yystype arg2)
} else {
G4cerr << "integer operand expected for "
<< rangeString
<< '.' << endl;
<< '.' << G4endl;
} break;
case 'D':
if( arg2.type == CONSTDOUBLE ) {
@@ -762,7 +758,7 @@ Eval2(yystype arg1, int op, yystype arg2)
} else {
G4cerr << "integer operand expected for "
<< rangeString
<< '.' << endl;
<< '.' << G4endl;
} break;
case 'D':
if( arg1.type == CONSTDOUBLE ) {
@@ -790,14 +786,14 @@ CompareInt(int arg1, int op, int arg2)
case EQ: result = ( arg1 == arg2); opr= "=="; break;
case NE: result = ( arg1 != arg2); opr= "!="; break;
default:
G4cerr << "Parameter range: error at CompareInt" << endl;
G4cerr << "Parameter range: error at CompareInt" << G4endl;
paramERR = 1;
}
#ifdef DEBUG
G4cerr << "CompareInt "
<< arg1 << " " << opr << arg2
<< " result: " << result
<< endl;
<< G4endl;
#endif
return result;
}
@@ -816,14 +812,14 @@ CompareDouble(double arg1, int op, double arg2)
case NE: result = ( arg1 != arg2); opr= "!="; break;
default:
G4cerr << "Parameter range: error at CompareDouble"
<< endl;
<< G4endl;
paramERR = 1;
}
#ifdef DEBUG
G4cerr << "CompareDouble "
<< arg1 <<" " << opr << " "<< arg2
<< " result: " << result
<< endl;
<< G4endl;
#endif
return result;
}
@@ -841,7 +837,7 @@ IndexOf( G4String nam)
}
}
paramERR = 1;
G4cerr << "parameter name:"<<nam<<" not found."<< endl;
G4cerr << "parameter name:"<<nam<<" not found."<< G4endl;
return 0;
}
@@ -880,7 +876,7 @@ Yylex() // reads input and returns token number, KR486
c=='e' || c=='E' || c=='+' || c=='-');
G4UIpUngetc(c);
const char* t = buf;
istrstream is((char*)t);
G4std::istrstream is((char*)t);
if ( IsInt(buf.data(),20) ) {
is >> yylval.I;
return CONSTINT;
@@ -889,7 +885,7 @@ Yylex() // reads input and returns token number, KR486
is >> yylval.D;
return CONSTDOUBLE;
} else {
G4cerr << buf<<": numeric format error."<<endl;
G4cerr << buf<<": numeric format error."<<G4endl;
}
}
buf="";
@@ -902,7 +898,7 @@ Yylex() // reads input and returns token number, KR486
yylval.S =buf;
return IDENTIFIER;
} else {
G4cerr << buf << " is not a parameter name."<< endl;
G4cerr << buf << " is not a parameter name."<< G4endl;
paramERR = 1;
}
}
@@ -944,10 +940,10 @@ G4UIpUngetc(int c) { // emulation of ungetc()
if (bp >0 && c == rangeString(bp-1)) {
--bp;
} else {
G4cerr << "G4UIpUngetc() failed." << endl;
G4cerr << "G4UIpUngetc() failed." << G4endl;
G4cerr << "bp="<<bp <<" c="<<c
<< " pR(bp-1)=" << rangeString(bp-1)
<< endl;
<< G4endl;
paramERR = 1;
return -1;
}
source/intercoms/src/G4UIcommandTree.cc
+13 -13
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4UIcommandTree.cc,v 1.2.2.1 1999/12/07 20:49:03 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4UIcommandTree.cc,v 1.4 2000/02/14 12:24:42 asaim Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
#include "G4UIcommandTree.hh"
@@ -22,7 +22,7 @@ G4UIcommandTree::G4UIcommandTree(G4String thePathName)
pathName = thePathName;
}
G4UIcommandTree::G4UIcommandTree(char * thePathName)
G4UIcommandTree::G4UIcommandTree(const char * thePathName)
:guidance(NULL)
{
pathName = thePathName;
@@ -174,45 +174,45 @@ G4UIcommand * G4UIcommandTree::FindPath(G4String commandPath)
void G4UIcommandTree::ListCurrent()
{
G4cout << "Command directory path : " << pathName << endl;
G4cout << "Command directory path : " << pathName << G4endl;
if( guidance != NULL ) guidance->List();
int i = 0;
G4cout << " Sub-directories : " << endl;
G4cout << " Sub-directories : " << G4endl;
int n_treeEntry = tree.entries();
for( int i_thTree = 0; i_thTree < n_treeEntry; i_thTree++ )
{
G4cout << " " << tree[i_thTree]->GetPathName()
<< " " << tree[i_thTree]->GetTitle() << endl;
<< " " << tree[i_thTree]->GetTitle() << G4endl;
}
G4cout << " Commands : " << endl;
G4cout << " Commands : " << G4endl;
int n_commandEntry = command.entries();
for( int i_thCommand = 0; i_thCommand < n_commandEntry; i_thCommand++ )
{
G4cout << " " << command[i_thCommand]->GetCommandName()
<< " * " << command[i_thCommand]->GetTitle() << endl;
<< " * " << command[i_thCommand]->GetTitle() << G4endl;
}
}
void G4UIcommandTree::ListCurrentWithNum()
{
G4cout << "Command directory path : " << pathName << endl;
G4cout << "Command directory path : " << pathName << G4endl;
if( guidance != NULL ) guidance->List();
int i = 0;
G4cout << " Sub-directories : " << endl;
G4cout << " Sub-directories : " << G4endl;
int n_treeEntry = tree.entries();
for( int i_thTree = 0; i_thTree < n_treeEntry; i_thTree++ )
{
i++;
G4cout << " " << i << ") " << tree[i_thTree]->GetPathName()
<< " " << tree[i_thTree]->GetTitle() << endl;
<< " " << tree[i_thTree]->GetTitle() << G4endl;
}
G4cout << " Commands : " << endl;
G4cout << " Commands : " << G4endl;
int n_commandEntry = command.entries();
for( int i_thCommand = 0; i_thCommand < n_commandEntry; i_thCommand++ )
{
i++;
G4cout << " " << i << ") " << command[i_thCommand]->GetCommandName()
<< " * " << command[i_thCommand]->GetTitle() << endl;
<< " * " << command[i_thCommand]->GetTitle() << G4endl;
}
}
source/intercoms/src/G4UIcontrolMessenger.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: G4UIcontrolMessenger.cc,v 1.1.10.1 1999/12/07 20:49:03 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4UIcontrolMessenger.cc,v 1.2 1999/12/15 14:50:42 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
#include "G4UIcontrolMessenger.hh"
source/intercoms/src/G4UIdirectory.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: G4UIdirectory.cc,v 1.1.10.1 1999/12/07 20:49:03 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4UIdirectory.cc,v 1.2 1999/12/15 14:50:42 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
source/intercoms/src/G4UImanager.cc
+21 -25
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4UImanager.cc,v 1.3.2.1 1999/12/07 20:49:03 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4UImanager.cc,v 1.5 2000/02/14 08:41:25 asaim Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
// ---------------------------------------------------------------------
@@ -22,11 +22,7 @@
#include "G4ios.hh"
#include "G4strstreambuf.hh"
#ifdef WIN32
# include <Strstrea.h>
#else
# include <strstream.h>
#endif
#include "g4std/strstream"
G4UImanager * G4UImanager::fUImanager = 0;
G4bool G4UImanager::fUImanagerHasBeenKilled = false;
@@ -87,7 +83,7 @@ G4String G4UImanager::GetCurrentValues(const char * aCommand)
savedCommand = treeTop->FindPath( theCommand );
if( savedCommand == NULL )
{
G4cerr << "command not found" << endl;
G4cerr << "command not found" << G4endl;
return G4String();
}
return savedCommand->GetCurrentValue();
@@ -138,7 +134,7 @@ const char * aParameterName, G4bool reGet)
GetCurrentStringValue( aCommand, aParameterName, reGet );
G4int value;
const char* t = targetParameter;
istrstream is((char*)t);
G4std::istrstream is((char*)t);
is >> value;
return value;
}
@@ -150,7 +146,7 @@ int parameterNumber, G4bool reGet)
GetCurrentStringValue( aCommand, parameterNumber, reGet );
G4int value;
const char* t = targetParameter;
istrstream is((char*)t);
G4std::istrstream is((char*)t);
is >> value;
return value;
}
@@ -162,7 +158,7 @@ const char * aParameterName, G4bool reGet)
GetCurrentStringValue( aCommand, aParameterName, reGet );
G4double value;
const char* t = targetParameter;
istrstream is((char*)t);
G4std::istrstream is((char*)t);
is >> value;
return value;
}
@@ -174,7 +170,7 @@ int parameterNumber, G4bool reGet)
GetCurrentStringValue( aCommand, parameterNumber, reGet );
G4double value;
const char* t = targetParameter;
istrstream is((char*)t);
G4std::istrstream is((char*)t);
is >> value;
return value;
}
@@ -198,7 +194,7 @@ void G4UImanager::ExecuteMacroFile(G4String fileName)
session = previousSession;
}
int G4UImanager::ApplyCommand(char * aCommand)
int G4UImanager::ApplyCommand(const char * aCommand)
{
G4String theCommand = aCommand;
return ApplyCommand(theCommand);
@@ -206,7 +202,7 @@ int G4UImanager::ApplyCommand(char * aCommand)
int G4UImanager::ApplyCommand(G4String aCommand)
{
if(verboseLevel) G4cout << aCommand << endl;
if(verboseLevel) G4cout << aCommand << G4endl;
G4String commandString;
G4String commandParameter;
@@ -224,14 +220,14 @@ int G4UImanager::ApplyCommand(G4String aCommand)
G4UIcommand * targetCommand = treeTop->FindPath( commandString );
if( targetCommand == NULL )
{
// G4cout << commandString << " NOT FOUND." << endl;
// G4cout << commandString << " NOT FOUND." << G4endl;
return fCommandNotFound;
}
if(!(targetCommand->IsAvailable()))
{ return fIllegalApplicationState; }
if(saveHistory) historyFile << aCommand << endl;
if(saveHistory) historyFile << aCommand << G4endl;
histVec.insert(aCommand);
return targetCommand->DoIt( commandParameter );
}
@@ -268,7 +264,7 @@ void G4UImanager::ListCommands(G4String direct)
if(comTree)
{ comTree->List(); }
else
{ G4cout << direct << " is not found." << endl; }
{ G4cout << direct << " is not found." << G4endl; }
}
G4UIcommandTree* G4UImanager::FindDirectory(const char* dirName)
@@ -297,7 +293,7 @@ void G4UImanager::Interact()
Interact(G4String("G4> "));
}
void G4UImanager::Interact(char * pC)
void G4UImanager::Interact(const char * pC)
{
G4String cc = pC;
Interact(cc);
@@ -305,13 +301,13 @@ void G4UImanager::Interact(char * pC)
void G4UImanager::Interact(G4String pC)
{
G4cerr << "G4UImanager::Interact() is out of date and is not used anymore." << endl;
G4cerr << "This method will be removed shortly!!!" << endl;
G4cerr << "In case of main() use" << endl;
G4cerr << " G4UIsession * session = new G4UIterminal;" << endl;
G4cerr << " session->SessionStart();" << endl;
G4cerr << "In other cases use" << endl;
G4cerr << " G4StateManager::GetStateManager()->Pause();" << endl;
G4cerr << "G4UImanager::Interact() is out of date and is not used anymore." << G4endl;
G4cerr << "This method will be removed shortly!!!" << G4endl;
G4cerr << "In case of main() use" << G4endl;
G4cerr << " G4UIsession * session = new G4UIterminal;" << G4endl;
G4cerr << " session->SessionStart();" << G4endl;
G4cerr << "In other cases use" << G4endl;
G4cerr << " G4StateManager::GetStateManager()->Pause();" << G4endl;
}
source/intercoms/src/G4UImessenger.cc
+8 -12
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4UImessenger.cc,v 1.1.10.1 1999/12/07 20:49:03 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4UImessenger.cc,v 1.2 1999/12/15 14:50:42 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
#include "G4UImessenger.hh"
@@ -15,11 +15,7 @@
#include <string.h>
#include "G4ios.hh"
#ifdef WIN32
# include <Strstrea.h>
#else
# include <strstream.h>
#endif
#include "g4std/strstream"
G4UImessenger::G4UImessenger() { }
@@ -42,7 +38,7 @@ G4bool G4UImessenger::operator == (const G4UImessenger& messenger) const {
G4String G4UImessenger::ItoS(G4int i)
{
char defVal[20];
ostrstream os(defVal,20);
G4std::ostrstream os(defVal,20);
os << i << '\0';
return G4String(defVal);
}
@@ -50,7 +46,7 @@ G4String G4UImessenger::ItoS(G4int i)
G4String G4UImessenger::DtoS(G4double a)
{
char defVal[40];
ostrstream os(defVal,40);
G4std::ostrstream os(defVal,40);
os << a << '\0';
return G4String(defVal);
}
@@ -66,7 +62,7 @@ G4int G4UImessenger::StoI(G4String s)
{
G4int vl;
const char* t = s;
istrstream is((char*)t);
G4std::istrstream is((char*)t);
is >> vl;
return vl;
}
@@ -75,7 +71,7 @@ G4double G4UImessenger::StoD(G4String s)
{
G4double vl;
const char* t = s;
istrstream is((char*)t);
G4std::istrstream is((char*)t);
is >> vl;
return vl;
}
@@ -94,6 +90,6 @@ G4bool G4UImessenger::StoB(G4String s)
void G4UImessenger::AddUIcommand(G4UIcommand * newCommand)
{
G4cerr << "Warning : Old style definition of G4UIcommand <"
<< newCommand->GetCommandPath() << ">." << endl;
<< newCommand->GetCommandPath() << ">." << G4endl;
}
source/intercoms/src/G4UIparameter.cc
+56 -56
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4UIparameter.cc,v 1.3.2.1 1999/12/07 20:49:04 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4UIparameter.cc,v 1.4 1999/12/15 14:50:42 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
#include "G4UIparameter.hh"
@@ -72,28 +72,28 @@ int G4UIparameter::operator!=(const G4UIparameter &right) const
void G4UIparameter::List()
{
G4cout << endl << "Parameter : " << parameterName << endl;
G4cout << G4endl << "Parameter : " << parameterName << G4endl;
if( ! parameterGuidance.isNull() )
G4cout << parameterGuidance << endl ;
G4cout << " Parameter type : " << parameterType << endl;
G4cout << parameterGuidance << G4endl ;
G4cout << " Parameter type : " << parameterType << G4endl;
if(omittable)
{ G4cout << " Omittable : True" << endl; }
{ G4cout << " Omittable : True" << G4endl; }
else
{ G4cout << " Omittable : False" << endl; }
{ G4cout << " Omittable : False" << G4endl; }
if( currentAsDefaultFlag )
{ G4cout << " Default value : taken from the current value" << endl; }
{ G4cout << " Default value : taken from the current value" << G4endl; }
else if( ! defaultValue.isNull() )
{ G4cout << " Default value : " << defaultValue << endl; }
{ G4cout << " Default value : " << defaultValue << G4endl; }
if( ! parameterRange.isNull() )
G4cout << " Parameter range : " << parameterRange << endl;
G4cout << " Parameter range : " << parameterRange << G4endl;
if( ! parameterCandidate.isNull() )
G4cout << " Candidates : " << parameterCandidate << endl;
G4cout << " Candidates : " << parameterCandidate << G4endl;
}
void G4UIparameter::SetDefaultValue(G4int theDefaultValue)
{
char defVal[20];
ostrstream os(defVal,20);
G4std::ostrstream os(defVal,20);
os << theDefaultValue << '\0';
defaultValue = defVal;
}
@@ -101,7 +101,7 @@ void G4UIparameter::SetDefaultValue(G4int theDefaultValue)
void G4UIparameter::SetDefaultValue(G4double theDefaultValue)
{
char defVal[20];
ostrstream os(defVal,20);
G4std::ostrstream os(defVal,20);
os << theDefaultValue << '\0';
defaultValue = defVal;
}
@@ -134,7 +134,7 @@ CandidateCheck(G4String newValue) {
iToken++;
if(aToken==newValue) return iToken;
}
G4cerr << "parameter value is not listed in the candidate List." << endl;
G4cerr << "parameter value is not listed in the candidate List." << G4endl;
return 0;
}
@@ -143,7 +143,7 @@ RangeCheck(G4String newValue) {
yystype result;
bp = 0; // reset buffer pointer for G4UIpGetc()
const char* t = newValue;
istrstream is((char*)t);
G4std::istrstream is((char*)t);
char type = toupper( parameterType );
switch (type) {
case 'D': { is >> newVal.D; } break;
@@ -155,11 +155,11 @@ RangeCheck(G4String newValue) {
result = Expression();
if( paramERR == 1 ) return 0;
if( result.type != CONSTINT) {
G4cerr << "Illegal Expression in parameter range." << endl;
G4cerr << "Illegal Expression in parameter range." << G4endl;
return 0;
}
if ( result.I ) return 1;
G4cerr << "parameter out of range: "<< parameterRange << endl;
G4cerr << "parameter out of range: "<< parameterRange << G4endl;
return 0;
}
@@ -172,13 +172,13 @@ TypeCheck(G4String newValue)
case 'D':
if( IsDouble(newValue.data())== 0) {
G4cerr<<newValue<<": double value expected."
<< endl;
<< G4endl;
return 0;
} break;
case 'I':
if( IsInt(newValue.data(),20)== 0) {
G4cerr<<newValue<<": integer expected."
<< endl;
<< G4endl;
return 0;
} break;
case 'S': break;
@@ -191,7 +191,7 @@ TypeCheck(G4String newValue)
||newValue == "TRUE" || newValue == "FALSE")
return 1;
else {
G4cerr<<newValue<<": bool expected." << endl;
G4cerr<<newValue<<": bool expected." << G4endl;
return 0;
}
default: ;
@@ -201,7 +201,7 @@ TypeCheck(G4String newValue)
int G4UIparameter::
IsInt(const char* buf, short maxDigits) // do not allow any ws
IsInt(const char* buf, short maxDigits) // do not allow any G4std::ws
{
const char* p= buf;
int length=0;
@@ -210,15 +210,15 @@ IsInt(const char* buf, short maxDigits) // do not allow any ws
while( isdigit( (int)(*p) )) { ++p; ++length; }
if( *p == '\0' ) {
if( length > maxDigits) {
G4cerr <<"digit length exceeds"<<endl;
G4cerr <<"digit length exceeds"<<G4endl;
return 0;
}
return 1;
} else {
// G4cerr <<"illegal character after int:"<<buf<<endl;
// G4cerr <<"illegal character after int:"<<buf<<G4endl;
}
} else {
// G4cerr <<"illegal int:"<<buf<<endl;
// G4cerr <<"illegal int:"<<buf<<G4endl;
}
return 0;
}
@@ -296,7 +296,7 @@ Expression(void)
{
yystype result;
#ifdef DEBUG
G4cerr << " Expression()" << endl;
G4cerr << " Expression()" << G4endl;
#endif
result = LogicalORExpression();
return result;
@@ -310,7 +310,7 @@ LogicalORExpression(void)
p = LogicalANDExpression();
if( token != LOGICALOR) return p;
if( p.type == CONSTSTRING || p.type == IDENTIFIER ) {
G4cerr << "Parameter range: illegal type at '||'" << endl;
G4cerr << "Parameter range: illegal type at '||'" << G4endl;
paramERR = 1;
}
result.I = p.I;
@@ -319,7 +319,7 @@ LogicalORExpression(void)
token = Yylex();
p = LogicalANDExpression();
if( p.type == CONSTSTRING || p.type == IDENTIFIER ) {
G4cerr << "Parameter range: illegal type at '||'" <<endl;
G4cerr << "Parameter range: illegal type at '||'" <<G4endl;
paramERR = 1;
}
switch (p.type) {
@@ -330,7 +330,7 @@ LogicalORExpression(void)
result.I += (p.D != 0.0);
result.type = CONSTINT; break;
default:
G4cerr << "Parameter range: unknown type"<<endl;
G4cerr << "Parameter range: unknown type"<<G4endl;
paramERR = 1;
}
}
@@ -345,7 +345,7 @@ LogicalANDExpression(void)
p = EqualityExpression();
if( token != LOGICALAND) return p;
if( p.type == CONSTSTRING || p.type == IDENTIFIER ) {
G4cerr << "Parameter range: illegal type at '&&'" << endl;
G4cerr << "Parameter range: illegal type at '&&'" << G4endl;
paramERR = 1;
}
result.I = p.I;
@@ -354,7 +354,7 @@ LogicalANDExpression(void)
token = Yylex();
p = EqualityExpression();
if( p.type == CONSTSTRING || p.type == IDENTIFIER ) {
G4cerr << "Parameter range: illegal type at '&&'" << endl;
G4cerr << "Parameter range: illegal type at '&&'" << G4endl;
paramERR = 1;
}
switch (p.type) {
@@ -365,7 +365,7 @@ LogicalANDExpression(void)
result.I *= (p.D != 0.0);
result.type = CONSTINT; break;
default:
G4cerr << "Parameter range: unknown type."<< endl;
G4cerr << "Parameter range: unknown type."<< G4endl;
paramERR = 1;
}
}
@@ -380,7 +380,7 @@ EqualityExpression(void)
int operat;
yystype result;
#ifdef DEBUG
G4cerr << " EqualityExpression()" <<endl;
G4cerr << " EqualityExpression()" <<G4endl;
#endif
result = RelationalExpression();
if( token==EQ || token==NE ) {
@@ -391,12 +391,12 @@ EqualityExpression(void)
result.I = Eval2( arg1, operat, arg2 ); // semantic action
result.type = CONSTINT;
#ifdef DEBUG
G4cerr << " return code of Eval2(): " << result.I <<endl;
G4cerr << " return code of Eval2(): " << result.I <<G4endl;
#endif
} else {
if (result.type != CONSTINT && result.type != CONSTDOUBLE) {
G4cerr << "Parameter range: error at EqualityExpression"
<< endl;
<< G4endl;
paramERR = 1;
}
}
@@ -411,7 +411,7 @@ RelationalExpression(void)
int operat;
yystype result;
#ifdef DEBUG
G4cerr << " RelationalExpression()" <<endl;
G4cerr << " RelationalExpression()" <<G4endl;
#endif
arg1 = AdditiveExpression();
@@ -422,13 +422,13 @@ RelationalExpression(void)
result.I = Eval2( arg1, operat, arg2 ); // semantic action
result.type = CONSTINT;
#ifdef DEBUG
G4cerr << " return Eval2(): " << endl;
G4cerr << " return Eval2(): " << G4endl;
#endif
} else {
result = arg1;
}
#ifdef DEBUG
G4cerr <<" return RelationalExpression()" <<endl;
G4cerr <<" return RelationalExpression()" <<G4endl;
#endif
return result;
}
@@ -440,7 +440,7 @@ AdditiveExpression(void)
if( token != '+' && token != '-' ) return result;
G4cerr << "Parameter range: operator "
<< (char)token
<< " is not supported." << endl;
<< " is not supported." << G4endl;
paramERR = 1;
return result;
}
@@ -452,7 +452,7 @@ MultiplicativeExpression(void)
if( token != '*' && token != '/' && token != '%' ) return result;
G4cerr << "Parameter range: operator "
<< (char)token
<< " is not supported." << endl;
<< " is not supported." << G4endl;
paramERR = 1;
return result;
}
@@ -463,7 +463,7 @@ UnaryExpression(void)
yystype result;
yystype p;
#ifdef DEBUG
G4cerr <<" UnaryExpression"<< endl;
G4cerr <<" UnaryExpression"<< G4endl;
#endif
switch(token) {
case '-':
@@ -484,7 +484,7 @@ UnaryExpression(void)
token = Yylex();
G4cerr << "Parameter range error: "
<< "operator '!' is not supported (sorry)."
<< endl;
<< G4endl;
paramERR = 1;
result = UnaryExpression(); break;
default:
@@ -499,7 +499,7 @@ PrimaryExpression(void)
{
yystype result;
#ifdef DEBUG
G4cerr <<" PrimaryExpression" << endl;
G4cerr <<" PrimaryExpression" << G4endl;
#endif
switch (token) {
case IDENTIFIER:
@@ -518,7 +518,7 @@ PrimaryExpression(void)
token= Yylex();
result = Expression();
if( token != ')' ) {
G4cerr << " ')' expected" << endl;
G4cerr << " ')' expected" << G4endl;
paramERR = 1;
}
token = Yylex();
@@ -537,7 +537,7 @@ Eval2(yystype arg1, int op, yystype arg2)
if( (arg1.type != IDENTIFIER) && (arg2.type != IDENTIFIER)) {
G4cerr << parameterName
<< ": meaningless comparison "
<< arg1.type << " " << arg2.type << endl;
<< arg1.type << " " << arg2.type << G4endl;
paramERR = 1;
}
char type = toupper( parameterType );
@@ -549,7 +549,7 @@ Eval2(yystype arg1, int op, yystype arg2)
} else {
G4cerr << "integer operand expected for "
<< parameterRange << '.'
<< endl;
<< G4endl;
}
break;
case 'D':
@@ -570,7 +570,7 @@ Eval2(yystype arg1, int op, yystype arg2)
} else {
G4cerr << "integer operand expected for "
<< parameterRange << '.'
<< endl;
<< G4endl;
}
break;
case 'D':
@@ -583,7 +583,7 @@ Eval2(yystype arg1, int op, yystype arg2)
default: ;
}
}
G4cerr << "no param name is specified at the param range."<<endl;
G4cerr << "no param name is specified at the param range."<<G4endl;
return 0;
}
@@ -600,14 +600,14 @@ CompareInt(int arg1, int op, int arg2)
case EQ: result = ( arg1 == arg2); opr= "=="; break;
case NE: result = ( arg1 != arg2); opr= "!="; break;
default:
G4cerr << "Parameter range: error at CompareInt" << endl;
G4cerr << "Parameter range: error at CompareInt" << G4endl;
paramERR = 1;
}
#ifdef DEBUG
G4cerr << "CompareInt "
<< arg1 << " " << opr << arg2
<< " result: " << result
<< endl;
<< G4endl;
#endif
return result;
}
@@ -625,14 +625,14 @@ CompareDouble(double arg1, int op, double arg2)
case EQ: result = ( arg1 == arg2); opr= "=="; break;
case NE: result = ( arg1 != arg2); opr= "!="; break;
default:
G4cerr << "Parameter range: error at CompareDouble" << endl;
G4cerr << "Parameter range: error at CompareDouble" << G4endl;
paramERR = 1;
}
#ifdef DEBUG
G4cerr << "CompareDouble "
<< arg1 <<" " << opr << " "<< arg2
<< " result: " << result
<< endl;
<< G4endl;
#endif
return result;
}
@@ -658,7 +658,7 @@ Yylex() // reads input and returns token number KR486
c=='e' || c=='E' || c=='+' || c=='-');
G4UIpUngetc(c);
const char* t = buf;
istrstream is((char*)t);
G4std::istrstream is((char*)t);
if ( IsInt(buf.data(),20) ) {
is >> yylval.I;
return CONSTINT;
@@ -667,7 +667,7 @@ Yylex() // reads input and returns token number KR486
is >> yylval.D;
return CONSTDOUBLE;
} else {
G4cerr << buf<<": numeric format error."<<endl;
G4cerr << buf<<": numeric format error."<<G4endl;
}
}
buf="";
@@ -680,7 +680,7 @@ Yylex() // reads input and returns token number KR486
yylval.S =buf;
return IDENTIFIER;
} else {
G4cerr << buf << " is not a parameter name."<< endl;
G4cerr << buf << " is not a parameter name."<< G4endl;
paramERR = 1;
}
}
@@ -722,10 +722,10 @@ G4UIpUngetc(int c) { // emulation of ungetc()
if (bp >0 && c == parameterRange(bp-1)) {
--bp;
} else {
G4cerr << "G4UIpUngetc() failed." << endl;
G4cerr << "G4UIpUngetc() failed." << G4endl;
G4cerr << "bp="<<bp <<" c="<<c
<< " pR(bp-1)=" << parameterRange(bp-1)
<< endl;
<< G4endl;
paramERR = 1;
return -1;
}
source/intercoms/src/G4UIsession.cc
+4 -4
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4UIsession.cc,v 1.1.10.1 1999/12/07 20:49:04 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4UIsession.cc,v 1.3 1999/12/15 17:52:03 gcosmo Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
// ---------------------------------------------------------------------
@@ -23,12 +23,12 @@ void G4UIsession::PauseSessionStart(G4String Prompt) {;}
G4int G4UIsession::ReceiveG4cout(G4String coutString)
{
cout << coutString << flush;
G4std::cout << coutString << G4std::flush;
return 0;
}
G4int G4UIsession::ReceiveG4cerr(G4String cerrString)
{
cerr << cerrString << flush;
G4std::cerr << cerrString << G4std::flush;
return 0;
}
source/intercoms/src/G4UnitsMessenger.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: G4UnitsMessenger.cc,v 1.1.10.1 1999/12/07 20:49:04 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4UnitsMessenger.cc,v 1.2 1999/12/15 14:50:42 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
source/intercoms/src/G4VGlobalFastSimulationManager.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: G4VGlobalFastSimulationManager.cc,v 1.1.8.1 1999/12/07 20:49:04 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4VGlobalFastSimulationManager.cc,v 1.2 1999/12/15 14:50:42 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
// Abstract interface for GEANT4 Global Fast Simulation Manager.
source/intercoms/src/G4VStateDependent.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: G4VStateDependent.cc,v 1.1.10.1 1999/12/07 20:49:04 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4VStateDependent.cc,v 1.2 1999/12/15 14:50:42 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
// ------------------------------------------------------------
source/intercoms/src/G4VVisManager.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: G4VVisManager.cc,v 1.2.8.1 1999/12/07 20:49:04 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4VVisManager.cc,v 1.3 1999/12/15 14:50:42 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
// Abstract interface for GEANT4 Visualization Manager.