Skip to content

[io] Extend flexibility of array size I/O marker #20070

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

[io] Extend flexibility of array size I/O marker #20070

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 18 additions & 4 deletions io/io/src/TStreamerInfo.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,18 +569,27 @@ void TStreamerInfo::Build(Bool_t isTransient)
}

TDataMember* dmCounter = 0;
int premultiplier = 1;
if (dmIsPtr) {
//
// look for a pointer data member with a counter
// in the comment string, like so:
//
// int n;
// double* MyArray; //[n]
//
// double* MyMatrix;//[3*n]

const char* lbracket = TVirtualStreamerInfo::GetElementCounterStart(dmTitle);
const char* rbracket = ::strchr(dmTitle, ']');
const char* rbracket = std::strchr(dmTitle, ']');
if (lbracket && rbracket) {
const char* counterName = dm->GetArrayIndex();
auto multiple = std::strchr(counterName, '*');
if (multiple) {
std::string s;
s.assign(counterName, multiple - counterName);
premultiplier = std::stoi(s);
counterName = multiple + 1;
}
TRealData* rdCounter = (TRealData*) fClass->GetListOfRealData()->FindObject(counterName);
if (!rdCounter || rdCounter->TestBit(TRealData::kTransient)) {
if (!isTransient)
Expand Down Expand Up @@ -622,7 +631,12 @@ void TStreamerInfo::Build(Bool_t isTransient)
} else if (dmIsPtr && (dtype != kCharStar)) {
if (dmCounter) {
// data member is pointer to an array of basic types
element = new TStreamerBasicPointer(dmName, dmTitle, offset, dtype, dm->GetArrayIndex(), dmCounter->GetClass()->GetName(), dmCounter->GetClass()->GetClassVersion(), dmFull);
const char* counterName = dm->GetArrayIndex();
auto multiple = std::strchr(counterName, '*');
if (multiple) {
counterName = multiple + 1;
}
element = new TStreamerBasicPointer(dmName, dmTitle, offset, dtype, counterName, dmCounter->GetClass()->GetName(), dmCounter->GetClass()->GetClassVersion(), dmFull);
} else {
if ((fName == "TString") || (fName == "TClass")) {
continue;
Expand Down Expand Up @@ -748,7 +762,7 @@ void TStreamerInfo::Build(Bool_t isTransient)
if (!narr) {
narr = 1;
}
element->SetSize(dsize*narr);
element->SetSize(dsize*narr*premultiplier);
element->SetStreamer(streamer);
if (!streamer) {
Int_t k = element->GetType();
Expand Down
Loading