Import Geant4 10.6.0 source tree

source/analysis/g4tools/include/tools/rroot/fac

@@ -5,6 +5,7 @@
 #define tools_rroot_fac
 
 #include "../sout"
+#include "../S_STRING"
 
 #include "branch_element"
 #include "branch_object"
@@ -13,18 +14,22 @@
 #include "tree_index"
 #include "stl_vector"
 #include "dummy"
-#include "list"
+#include "obj_list"
+#include "vector3"
+#include "matrix"
+
+#ifdef TOOLS_MEM
+#include "../mem"
+#endif
 
 namespace tools {
 namespace rroot {
 
 class fac : public virtual ifac {
 public:
-  static const std::string& s_class() {
-    static const std::string s_v("tools::rroot::fac");
-    return s_v;
-  }
+  TOOLS_SCLASS(tools::rroot::fac)
 public: //ifac
+  virtual std::ostream& out() const {return m_out;}
   virtual iro* create(const std::string& a_class,const args&) {
     //m_out << "tools::rroot::fac::create :"
     //      << " create object of class " << a_class << "..."
@@ -71,7 +76,12 @@ public: //ifac
       return new tree_index();
 
     } else if(a_class=="TList") {
-      return new obj_list(*this,true,true);
+      return new obj_list(*this);
+    } else if(a_class=="TVector3") {
+      return new vector3();
+    } else if(a_class=="TMatrix") {
+      return new matrix();
+
     } else if(a_class=="TNamed") {
       return new named();
 
@@ -118,12 +128,23 @@ public: //ifac
       return new dummy();
     }
   }
-  virtual void destroy(iro*& a_obj) {delete a_obj;a_obj = 0;}
 public:
-  fac(std::ostream& a_out):m_out(a_out){}
-  virtual ~fac(){}
+  fac(std::ostream& a_out):m_out(a_out){
+#ifdef TOOLS_MEM
+    mem::increment(s_class().c_str());
+#endif
+  }
+  virtual ~fac(){
+#ifdef TOOLS_MEM
+    mem::decrement(s_class().c_str());
+#endif
+  }
 public:
-  fac(const fac& a_from):ifac(a_from),m_out(a_from.m_out){}
+  fac(const fac& a_from):ifac(a_from),m_out(a_from.m_out){
+#ifdef TOOLS_MEM
+    mem::increment(s_class().c_str());
+#endif
+  }
   fac& operator=(const fac&){return *this;}
 protected:
 /*