added ClassImp macro

[u/mrichter/AliRoot.git] / TGeant4 / TG4Globals.h

diff --git a/TGeant4/TG4Globals.h b/TGeant4/TG4Globals.h
index 0731ccc1ac496367e79a669fd8f86e14c5bc9e36..8841d14662ac7c405bf6fd07ebbed7c7fce6d458 100644 (file)
--- a/TGeant4/TG4Globals.h
+++ b/TGeant4/TG4Globals.h
@@ -1,29 +1,33 @@
 // $Id$
 // Category: global
 //
-// Class for generally used basic types and functions.
+// Author: I. Hrivnacova
+//
+// Class TG4Globals
+// ----------------
+// Class provides the basic types and functions of general use. 
 // It is protected from instantiating (only static data members
 // and static methods are defined).
 
 #ifndef TG4_GLOBALS_H
 #define TG4_GLOBALS_H
 
-#include "TG3Flag.h"
+#include "TG4G3Control.h"
 
 #include <globals.hh>
 #include <g4std/vector>
-#include <g4rw/tvordvec.h>
-#include <g4rw/tpordvec.h>
+#include <g4std/set>
+#include <G4RotationMatrix.hh>
 
 class G4Material;
 class G4Element;
 
-typedef vector<G4bool>   TG4boolVector;
-typedef G4RWTValOrderedVector<G4double> TG4doubleVector;
-typedef G4RWTValOrderedVector<G4String> TG4StringVector;
-typedef G4RWTValOrderedVector<TG3FlagValue> TG3FlagVector;
-typedef G4RWTPtrOrderedVector<G4Material>   TG4MaterialVector;
-typedef G4RWTPtrOrderedVector<G4Element>    TG4ElementVector;  
+// basic types containers
+typedef G4std::vector<G4bool>   TG4boolVector;
+typedef G4std::vector<G4int>    TG4intVector;
+typedef G4std::vector<G4double> TG4doubleVector;
+typedef G4std::vector<G4String> TG4StringVector;
+typedef G4std::set <G4String, G4std::less<G4String> > TG4StringSet; 
 
 class TG4Globals
 {
@@ -38,6 +42,9 @@ class TG4Globals
       // program - according to G4Exception.cc
     static void Warning(const char* string=0);
       // Global warning function prints string to cerr
+    static void AppendNumberToString(G4String& string, G4int number);
+    static G4bool Compare(G4bool activation, TG4G3ControlValue controlValue);
+    static void PrintStars(G4bool emptyLineFirst);
 
   protected:
     TG4Globals();