Skip to content

Provide actions for text-based streamers #580

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

Merged
pcanal merged 10 commits into from
May 27, 2017
Merged

Provide actions for text-based streamers #580

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4be8c5b
io: introduce actions list for text writing like JSON or XML
linev May 15, 2017
a070ef3
json: use new actions list for writing objects data
linev May 15, 2017
e94695e
io: provide specialized write actions for TObject and TNamed
linev May 15, 2017
8474285
json: fix problem with TObject storage
linev May 15, 2017
40df040
io: introduce WriteTextStreamerLoop action
linev May 16, 2017
1bfeaa5
io: make WriteStreamerLoop action templated
linev May 16, 2017
3ab4375
json: fix problem with kStreamLoop with fCounter==1
linev May 16, 2017
1fef7c9
json: rudimentary support for TRef
linev May 16, 2017
a5bbd42
io: provide kSTLp text write action
linev May 16, 2017
caae5b0
io: use template<bool kIsTextT> parametrer for text actions
linev May 16, 2017
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
Prev Previous commit
Next Next commit
json: fix problem with kStreamLoop with fCounter==1 
It should be handled as normal array.
  • Loading branch information
@linev
linev committed May 16, 2017
commit 3ab437599cf73346f4a1df985d2db213c20f0aaa
18 changes: 13 additions & 5 deletions io/io/src/TBufferJSON.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ class TArrayIndexProducer {
TArrayI fIndicies;
TArrayI fMaxIndex;
TString fRes;
Bool_t fIsArray;

public:
TArrayIndexProducer(TStreamerElement* elem, Int_t arraylen, const char* separ) :
Expand All @@ -102,13 +103,15 @@ class TArrayIndexProducer {
fSepar(separ),
fIndicies(),
fMaxIndex(),
fRes()
fRes(),
fIsArray(kFALSE)
{
Bool_t usearrayindx = elem && (elem->GetArrayDim() > 0);
Bool_t usearraylen = (arraylen > 1);

if (usearrayindx && (arraylen > 0)) {
if ((elem->GetType() == TStreamerInfo::kOffsetL + TStreamerInfo::kStreamLoop) ||
(elem->GetType() == TStreamerInfo::kStreamLoop)) usearrayindx = kFALSE;
(elem->GetType() == TStreamerInfo::kStreamLoop)) { usearrayindx = kFALSE; usearraylen = kTRUE; }
else
if (arraylen != elem->GetArrayLength()) {
printf("Problem with JSON coding of element %s type %d \n", elem->GetName(), elem->GetType());
Expand All @@ -120,11 +123,13 @@ class TArrayIndexProducer {
fMaxIndex.Set(elem->GetArrayDim());
for(int dim=0;dim<elem->GetArrayDim();dim++)
fMaxIndex[dim] = elem->GetMaxIndex(dim);
fIsArray = fTotalLen>1;
} else
if (arraylen > 1) {
if (usearraylen) {
fTotalLen = arraylen;
fMaxIndex.Set(1);
fMaxIndex[0] = arraylen;
fIsArray = kTRUE;
}

if (fMaxIndex.GetSize() > 0) {
Expand All @@ -139,7 +144,8 @@ class TArrayIndexProducer {
fSepar(separ),
fIndicies(),
fMaxIndex(),
fRes()
fRes(),
fIsArray(kFALSE)
{
Int_t ndim = member->GetArrayDim();
if (extradim > 0) ndim++;
Expand All @@ -159,6 +165,7 @@ class TArrayIndexProducer {
fTotalLen *= extradim;
}
}
fIsArray = fTotalLen>1;
}

Int_t ReduceDimension()
Expand All @@ -171,13 +178,14 @@ class TArrayIndexProducer {
fMaxIndex.Set(ndim);
fIndicies.Set(ndim);
fTotalLen = fTotalLen/len;
fIsArray = fTotalLen>1;
return len;
}


Bool_t IsArray() const
{
return (fTotalLen>1);
return fIsArray;
}

Bool_t IsDone() const
Expand Down