--- DarthVader/RunInfo/src/RunInfo.cpp	2006/11/09 14:44:08	1.14
+++ DarthVader/RunInfo/src/RunInfo.cpp	2010/01/29 05:49:27	1.19
@@ -22,18 +22,10 @@
 //
 
 SoftInfo::SoftInfo() {
-  TRIG_ver = "";
-  TOF_ver = "";
-  AC_ver = "";
-  TRK_ver = "";
-  ORB_ver = "";
-  CAL_ver = "";
-  ND_ver = "";
-  S4_ver = "";  
-  DV_ver = "";
+  Clear();
 }
 
-void SoftInfo::Clear(){
+void SoftInfo::Clear(Option_t *t){
   TRIG_ver = "";
   TOF_ver = "";
   AC_ver = "";
@@ -209,6 +201,8 @@
     newrun->TRK_CALIB_USED = glrun->TRK_CALIB_USED             ;
     newrun->CAL_DSP_MASK  = glrun->CAL_DSP_MASK               ;
     newrun->BOOT_NUMBER  = glrun->BOOT_NUMBER                ;
+    newrun->PHYSENDRUN_MASK_S3S2S12  = glrun->PHYSENDRUN_MASK_S3S2S12                 ;
+    newrun->PHYSENDRUN_MASK_S11CRC  = glrun->PHYSENDRUN_MASK_S11CRC                 ;
     newrun->VALIDATION  = glrun->VALIDATION                 ;
     //
   };
@@ -336,7 +330,7 @@
     totnorun = 1;
     reprocessing = false;
     first_file_entry = 0;
-    last_file_entry = (UInt_t)(EV_TO - EV_FROM);
+    if ( EV_TO >= EV_FROM ) last_file_entry = (UInt_t)(EV_TO - EV_FROM);
     norun = 1;
     runlist->AddAt((Int_t)ID,0);
     //
@@ -368,7 +362,7 @@
     //
     for ( UInt_t run = 0; run < totnorun; run++){
       //
-      oldtree->GetEntry(run);
+      if ( oldtree->GetEntry(run) <= 0 ) throw -36; 
       //
       CopyFromTo(oldrun,newrun,oldver,newver);
       //
@@ -510,7 +504,7 @@
 	  };
 	};
 	//
-	last_file_entry = first_file_entry + (oldrun->EV_TO - oldrun->EV_FROM + 1);
+	if ( oldrun->EV_TO >= oldrun->EV_FROM ) last_file_entry = first_file_entry + (oldrun->EV_TO - oldrun->EV_FROM + 1);
 	//
       } else {
 	if ( !found ) first_file_entry += (oldrun->EV_TO - oldrun->EV_FROM + 1);
@@ -576,7 +570,7 @@
     //
     for ( UInt_t run = 0; run < totnorun; run++){
       //
-      newtree->GetEntry(run);
+      if ( newtree->GetEntry(run) <= 0 ) throw -36;
       //
       file_entries += (newrun->EV_TO - newrun->EV_FROM + 1);
       //
@@ -587,7 +581,7 @@
 	runlist->AddAt(newrun->ID,norun);
 	norun++;
       };
-      last_file_entry = first_file_entry + (newrun->EV_TO - newrun->EV_FROM + 1);
+      if ( newrun->EV_TO >= newrun->EV_FROM ) last_file_entry = first_file_entry + (newrun->EV_TO - newrun->EV_FROM + 1);
     };
   };
   if ( debug ) printf("norun %i \n",(int)norun);
@@ -612,7 +606,7 @@
   if ( isreadonly ) newtree->Delete();
 }
 
-void ItoRunInfo::Clear(){
+void ItoRunInfo::Clear(Option_t *t){
   if ( newtree ) newtree->Delete();
 }
 
@@ -665,12 +659,12 @@
   totnorun = newtree->GetEntries();
   //
   for ( UInt_t nrun = 0; nrun < totnorun; nrun++){  
-    newtree->GetEntry(nrun);
+    if ( newtree->GetEntry(nrun) <= 0 ) throw -36;
     //
     if ( nwrun->ID == run || run == 0 ){
       CopyFromTo(nwrun,(GL_RUN*)this,nwver,version);
       found = true;
-      last_file_entry = first_file_entry + (nwrun->EV_TO - nwrun->EV_FROM + 1);
+      if ( nwrun->EV_TO >= nwrun->EV_FROM ) last_file_entry = first_file_entry + (nwrun->EV_TO - nwrun->EV_FROM + 1);
     };
     if ( !found ) first_file_entry += (nwrun->EV_TO - nwrun->EV_FROM + 1);
   };