From 0ab456e5f5640141acc553f8b6fcc596856f45e8 Mon Sep 17 00:00:00 2001 From: nemu Date: Sat, 9 Jul 2011 16:24:09 +0000 Subject: [PATCH] added a dummy header extraction routine --- src/tests/PsiRoot/TPsiRunHeader.cpp | 15 +++++++++++++++ src/tests/PsiRoot/TPsiRunHeader.h | 1 + src/tests/PsiRoot/psi_runHeader_test.cpp | 12 ++++++++++-- 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/src/tests/PsiRoot/TPsiRunHeader.cpp b/src/tests/PsiRoot/TPsiRunHeader.cpp index ccf655e2..1905fd0b 100644 --- a/src/tests/PsiRoot/TPsiRunHeader.cpp +++ b/src/tests/PsiRoot/TPsiRunHeader.cpp @@ -137,6 +137,7 @@ TPsiRunHeader::~TPsiRunHeader() TObjArray* TPsiRunHeader::GetHeader() { // make sure that previous header is removed + fHeader.Delete(); fHeader.Expand(0); char str[1024], fmt[1024]; @@ -202,6 +203,20 @@ TObjArray* TPsiRunHeader::GetHeader() return &fHeader; } +//-------------------------------------------------------------------------- +// ExtractHeaderInformation (public) +//-------------------------------------------------------------------------- +/** + *

Extracts from an array of TObjStrings containing the header information + * all the necessary parameters. + * + * \param runHeader an array of TObjStrings containing the header information + */ +Bool_t TPsiRunHeader::ExtractHeaderInformation(TObjArray *runHeader) +{ + return true; +} + //-------------------------------------------------------------------------- // AddProperty (public) //-------------------------------------------------------------------------- diff --git a/src/tests/PsiRoot/TPsiRunHeader.h b/src/tests/PsiRoot/TPsiRunHeader.h index 27fdcf31..1a7680a8 100644 --- a/src/tests/PsiRoot/TPsiRunHeader.h +++ b/src/tests/PsiRoot/TPsiRunHeader.h @@ -81,6 +81,7 @@ public: virtual vector *GetProperties() { return &fProperties; } virtual TObjArray *GetHeader(); + virtual Bool_t ExtractHeaderInformation(TObjArray *runHeader); virtual void SetRunTitle(TString runTitle) { fRunTitle = runTitle; } virtual void SetRunNumber(Int_t runNumber) { fRunNumber = runNumber; } diff --git a/src/tests/PsiRoot/psi_runHeader_test.cpp b/src/tests/PsiRoot/psi_runHeader_test.cpp index ccc6af31..5c1f8ca3 100644 --- a/src/tests/PsiRoot/psi_runHeader_test.cpp +++ b/src/tests/PsiRoot/psi_runHeader_test.cpp @@ -77,8 +77,16 @@ int main(int argc, char *argv[]) return -1; } - f->mkdir("RunHeader"); - f->cd("RunHeader"); + // root file header related things +/* + TFolder *runInfo = gROOT->GetRootFolder()->AddFolder("RunInfo", "PSI RunInfo"); + gROOT->GetListOfBrowsables()->Add(runInfo, "RunInfo"); + runInfo->Add(header->GetHeader()); + runInfo->Write(); +*/ + + f->mkdir("RunInfo"); + f->cd("RunInfo"); header->GetHeader()->Write(); f->Close();