Changeset 1347 for trunk/source/persistency/ascii/src/G4tgrUtils.cc

Timestamp:

Dec 22, 2010, 3:52:27 PM (13 years ago)

Author:

garnier

Message:

geant4 tag 9.4

File:

• trunk/source/persistency/ascii/src/G4tgrUtils.cc (modified) (7 diffs)

trunk/source/persistency/ascii/src/G4tgrUtils.cc

@@ -78 +78 @@
 G4bool G4tgrUtils::IsNumber( const G4String& str)
 {
-  G4int isnum = 1;
+  G4int isnum = true;
   G4int numE = 0;
   for(size_t ii=0; ii<str.length(); ii++)
@@ -90 +90 @@
         if(numE != 0 || ii == str.length()-1)
         {
-          isnum = 0;
+          isnum = false;
           break;
         }
@@ -97 +97 @@
       else
       {
-        isnum = 0; 
+        isnum = false; 
         break;
       }
@@ -123 +123 @@
 void G4tgrUtils::Dump3v( const G4ThreeVector& vec, const char* msg) 
 {
-  G4cout << msg << std::setprecision(8) << vec << G4endl;
+  G4cout << msg << std::setprecision(8)
+         << vec << std::setprecision(6) << G4endl;
 }
 
@@ -346 +347 @@
         //----- Check if it is a function
         G4bool bWordOK = false;      
-        if( G4tgrUtils::WordIsFunction( word ) )
+        if( G4tgrUtils::IsFunction( word ) )
         {
           //--- It must be followed by '('
@@ -360 +361 @@
         //----- Check if it is a unit      
         }
-        else if( G4tgrUtils::WordIsUnit( word ) )
+        else if( !G4tgrUtils::IsNumber( word ) )
         {
           //--- It must be preceded by a *
@@ -550 +551 @@
 
 //-------------------------------------------------------------
-G4bool G4tgrUtils::WordIsUnit( const G4String& word ) 
-{
-  return !IsNumber(word);
-  if(    word == "mm"
-      || word == "cm"
-      || word == "m" 
-      || word == "km"
-      || word == "millimeter"
-      || word == "centimeter"
-      || word == "meter"
-      || word == "kilometer"
-      || word == "parsec"
-      || word == "micrometer"
-      || word == "nanometer"
-      || word == "angstrom"
-      || word == "fermi"
-      || word == "nm"
-      || word == "um"
-      || word == "pc"
-      || word == "radian"
-      || word == "milliradian"
-      || word == "degree"
-      || word == "rad"
-      || word == "mrad"
-      || word == "deg"
-      || word == "ns"
-      || word == "curie"
-      || word == "curie"   )
-  { 
-    return true;
-  }
-  else
-  { 
-    return false;
-  }
-}
-
-
-//-------------------------------------------------------------
-G4bool G4tgrUtils::WordIsFunction( const G4String& word ) 
+G4bool G4tgrUtils::IsFunction( const G4String& word ) 
 {
   if(    word == "sin"