--- DarthVader/RunInfo/src/RunInfo.cpp 2006/05/30 14:59:40 1.2 +++ DarthVader/RunInfo/src/RunInfo.cpp 2006/06/30 09:21:59 1.3 @@ -302,6 +302,10 @@ file->cd(); // file->Write("Run"); //newtree->Delete(); + delete newver; + delete newrun; + delete oldver; + delete oldrun; // return(0); // @@ -441,7 +445,7 @@ newver->ND_ver = oldver->ND_ver; newver->AC_ver = oldver->AC_ver; newver->ORB_ver = version->ORB_ver; - if ( strcmp(oldver->TRK_ver.Data(),"") ) reprocessing = true; + if ( strcmp(oldver->ORB_ver.Data(),"") ) reprocessing = true; }; if ( !strcmp(Detector.Data(),"CALO") ){ newver->TRIG_ver = oldver->TRIG_ver; @@ -497,6 +501,10 @@ newtree->SetName("Run"); // file->Write("Run"); // newtree->Delete(); + delete newver; + delete newrun; + delete oldver; + delete oldrun; // if ( !found ){ if ( debug ) printf("\n RUNINFO - ERROR: no run with ID_RUN = %llu \n",idRun); @@ -580,6 +588,8 @@ if ( debug ) printf("norun %i \n",(int)norun); Int_t error = 0; error = GetRunInfo(idRun); + delete newver; + delete newrun; if ( error ) return(error); return(0); } @@ -608,10 +618,12 @@ run->GetRunInfo((ULong64_t)nrun); if ( entry >= (UInt_t)run->first_file_entry && entry <= (UInt_t)run->last_file_entry ){ run->newtree->Delete(); + delete run; return(nrun); }; }; run->newtree->Delete(); + delete run; return(0); } @@ -661,5 +673,7 @@ if ( !found ) first_file_entry += (nwrun->EV_REG_PHYS_TO - nwrun->EV_REG_PHYS_FROM + 1); }; if ( found ) return(0); + delete nwver; + delete nwrun; return(-800); }