Skip to content

Small fix in TRestMetadata and TRestCut #557

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Small fix in TRestMetadata and TRestCut #557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
60343b5
fix TRestCut::Initialize
AlvaroEzq Nov 7, 2025
422a709
fix TRestMetadata::InstantiateChildMetadata
AlvaroEzq Nov 7, 2025
c8324ed
add TRestCut::Print
AlvaroEzq Nov 7, 2025
1079489
fix TRestMetadata::InstantiateChildMetadata II
AlvaroEzq Nov 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions source/framework/core/inc/TRestCut.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ class TRestCut : public TRestMetadata {
TRestCut& operator=(TRestCut& cut);

void PrintMetadata() override;
void Print();

Int_t Write(const char* name, Int_t option, Int_t bufsize) override;

Expand Down
14 changes: 10 additions & 4 deletions source/framework/core/src/TRestCut.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,11 @@ ClassImp(TRestCut);

TRestCut::TRestCut() { Initialize(); }

void TRestCut::Initialize() { fCuts.clear(); }
void TRestCut::Initialize() {
fCuts.clear();
fCutStrings.clear();
fParamCut.clear();
}

void TRestCut::InitFromConfigFile() {
auto ele = GetElement("cut");
Expand Down Expand Up @@ -158,12 +162,14 @@ void TRestCut::PrintMetadata() {
TRestMetadata::PrintMetadata();
RESTMetadata << " " << RESTendl;
RESTMetadata << "Cuts added: " << RESTendl;
for (const auto& cut : fCuts) {
RESTMetadata << cut.GetName() << " " << cut.GetTitle() << RESTendl;
}
Print();
RESTMetadata << "+++" << RESTendl;
}

void TRestCut::Print() {
for (const auto& cut : fCuts) RESTMetadata << cut.GetName() << " " << cut.GetTitle() << RESTendl;
}

Int_t TRestCut::Write(const char* name, Int_t option, Int_t bufsize) {
// write cuts to file.

Expand Down
4 changes: 2 additions & 2 deletions source/framework/core/src/TRestMetadata.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,8 +747,8 @@ TRestMetadata* TRestMetadata::InstantiateChildMetadata(int index, std::string pa
md->SetConfigFile(fConfigFileName);
TiXmlElement* rootEle = GetElementFromFile(fConfigFileName);
TiXmlElement* Global = GetElement("globals", rootEle);
md->LoadConfigFromElement(paraele, Global, {});
md->Initialize();
md->LoadConfigFromElement(paraele, Global, {});
return md;
}
}
Expand Down Expand Up @@ -798,8 +798,8 @@ TRestMetadata* TRestMetadata::InstantiateChildMetadata(std::string pattern, std:
TRestMetadata* md = (TRestMetadata*)c->New();
TiXmlElement* rootEle = GetElementFromFile(fConfigFileName);
TiXmlElement* Global = GetElement("globals", rootEle);
md->LoadConfigFromElement(paraele, Global, {});
md->Initialize();
md->LoadConfigFromElement(paraele, Global, {});
return md;
}
}
Expand Down
Loading