--- DarthVader/RunInfo/inc/RunInfo.h	2006/05/19 13:15:47	1.1
+++ DarthVader/RunInfo/inc/RunInfo.h	2012/05/15 14:31:19	1.9
@@ -3,18 +3,23 @@
 //
 #include <TObject.h>
 #include <TTree.h>
+#include <TChain.h>
 #include <TFile.h>
-#include <TArrayL.h>
+#include <TArrayI.h>
 #include <TSQLServer.h>
 //
 #include <GLTables.h>
 //
+#include <RunInfoStruct.h>
+
 
 class SoftInfo : public TObject {
 
  private:
     
  public:
+    TString DV_ver;
+    TString ORB_ver;
     TString TRIG_ver;
     TString TOF_ver;
     TString AC_ver;
@@ -22,21 +27,26 @@
     TString CAL_ver;
     TString S4_ver;
     TString ND_ver;
-    TString ORB_ver;
     //
     // Default constructor
     //
     SoftInfo();
+
+    void Clear(Option_t *t="");
+    void GetLevel2Struct(cSoftInfo *l2) const;
+    SoftInfo*   GetSoftInfo(){return this;};  
+    UInt_t GetSWinfo(TString DEC);
+      
     //
-    ClassDef(SoftInfo,1);
+    ClassDef(SoftInfo,2);
     //
 };
 
 class ItoRunInfo : public GL_RUN {
 
  private:
-    ULong64_t file_entries;
-    Long64_t totnorun;
+    UInt_t file_entries;
+    UInt_t totnorun;
     Int_t first_file_entry;
     Int_t last_file_entry;
     UInt_t norun;
@@ -45,19 +55,23 @@
     Bool_t isreadonly;
     TFile *file;
     TTree *newtree;
-    TArrayL *runlist;
-    ULong64_t idRun;
+    TArrayI *runlist;
+    UInt_t idRun;
     TSQLServer *dbc;
     TString processFolder;
     TString Detector;
+    void CopyFromTo(GL_RUN *, GL_RUN *, SoftInfo *, SoftInfo *);
     
  public:
     //
     SoftInfo *version;
     //
+    //    GL_RUN *glrun;
+    //
     // Default constructor
     //
     ItoRunInfo();
+    ~ItoRunInfo();
     //
     // Other constructors...
     //
@@ -71,22 +85,29 @@
     //
     //
     //
-    Int_t Update(ULong64_t run, TString Detector, TString Version);
-    Int_t Read(ULong64_t run);
-    Int_t GetRunInfo(ULong64_t run);
+    Int_t Update(UInt_t run, TString Detector, TString Version);
+    Int_t Read(UInt_t run);
+    void Write();
+    Int_t GetRunInfo(UInt_t run);
     UInt_t GetRunForEntry(UInt_t entry);
     void Close();
-    void Clear();
+    void Clear(Option_t *t="");
+    //
+    void *GetPointerToSI(){return &version;};
+    void *GetPointerToRI(){return this;};
+    //void *GetPointerToRI(){return &glrun;};
+    TChain *GetRunTree(TList *fl);
     //
-    Long64_t GetRunEntries(){return(totnorun);};
+    UInt_t GetRunEntries(){return(totnorun);};
     UInt_t GetNoRun(){return(norun);};
-    TArrayL *GetRunList(){return(runlist);};
+    TArrayI *GetRunList(){return(runlist);};
     Bool_t IsReprocessing(){return(reprocessing);};
     UInt_t GetFirstEntry(){return(first_file_entry);};
     UInt_t GetLastEntry(){return(last_file_entry-1);};
-    ULong64_t GetFileEntries(){return(file_entries);};    
+    UInt_t GetEntries(){Long64_t en = last_file_entry-1-first_file_entry; if ( en < 0LL ) en = 0LL; return((UInt_t)en);};
+    UInt_t GetFileEntries(){return(file_entries);};    
     //
-    ClassDef(ItoRunInfo,1);
+    ClassDef(ItoRunInfo,3);
     //
 };