switched to gjm merger for pet

diff --git a/tests_dav/GateMergeManager.cc b/tests_dav/GateMergeManager.cc
index 0de97949f520df2de5abbef35b633e9515184222..dc190fc367143fe5a42e2e9d4cdeb55b34243f62 100644 (file)
--- a/tests_dav/GateMergeManager.cc
+++ b/tests_dav/GateMergeManager.cc
@@ -123,9 +123,8 @@ void GateMergeManager::FastMergeRoot()
       exit(0);
    }
    //we try to recover the last_event_ID in all root files
-   filearr=new TFile*[nfiles];
    for(int i=0;i<nfiles;i++) {
-      filearr[i] = TFile::Open(m_vRootFileNames[i].c_str(),"OLD");
+      filearr.push_back(TFile::Open(m_vRootFileNames[i].c_str(),"OLD"));
       if(filearr[i]==NULL){
          cout<<"Not a readable file "<<m_vRootFileNames[i]<<" - exit!"<<endl;   
          exit(0);

diff --git a/tests_dav/GateMergeManager.hh b/tests_dav/GateMergeManager.hh
index f7fb09595a65ee0a58a716e87782d77ebd54aa69..737be32bebcd0620ebf5410f4900a0a66e06671e 100644 (file)
--- a/tests_dav/GateMergeManager.hh
+++ b/tests_dav/GateMergeManager.hh
@@ -31,26 +31,14 @@ public:
      m_outDir       =       outDir;
      m_CompLevel    =            1;
      m_fastMerge    =    fastMerge;
-
-     //check if a .Gate directory can be found
-     if (!getenv("GC_DOT_GATE_DIR")) {
-        cout<<"Environment variable GC_DOT_GATE_DIR not set !"<<endl;
-        exit(1);
-     }
-     m_dir=getenv("GC_DOT_GATE_DIR");
-     if (m_dir.substr(m_dir.length()-1,m_dir.length())=="/") m_dir=m_dir+".Gate/";
-     else m_dir=m_dir+"/.Gate/";
-     ifstream dirstream(m_dir.c_str());
-     if (!dirstream) {
-        cout<<"Failed to open .Gate directory"<<endl;
-        exit(1);
-     }
-     dirstream.close();
-
   };
   ~GateMergeManager()
   {
-   if (filearr) delete filearr;
+         for (std::vector<TFile*>::const_iterator iter=filearr.begin(); iter!=filearr.end(); iter++)
+         {
+                 (*iter)->Close();
+                 delete *iter;
+         }
   }
 
 
@@ -74,10 +62,9 @@ private:
   bool FastMergeCoin(string name); 
   bool           m_forced;             // if to overwrite existing files
   int      m_verboseLevel;  
-  TFile**         filearr;
+  std::vector<TFile*>         filearr;
   Long64_t      m_maxRoot;             // maximum size of root output file
   int         m_CompLevel;             // compression level for root output
-  string            m_dir;             // .Gate directory path 
   string         m_outDir;             // where to save the output files
   int            m_Nfiles;             // number of files to mergw
   vector<int> m_lastEvents;            // latestevent from al files