2424#include < TMap.h>
2525#include < TLeaf.h>
2626
27+ const char * removeVersionSuffix (const char * treeName)
28+ {
29+ // remove version suffix, e.g. O2v0_001 becomes O2v0
30+ static TString tmp;
31+ tmp = treeName;
32+ if (tmp.First (" _" 0 ) {
33+ tmp.Remove (tmp.First (" _"
34+ }
35+ return tmp;
36+ }
37+
38+ const char * getTableName (const char * branchName, const char * treeName)
39+ {
40+ // Syntax for branchName:
41+ // fIndex<Table>[_<Suffix>]
42+ // fIndexArray<Table>[_<Suffix>]
43+ // fIndexSlice<Table>[_<Suffix>]
44+ // if <Table> is empty it is a self index and treeName is used as table name
45+ static TString tableName;
46+ tableName = branchName;
47+ if (tableName.BeginsWith (" fIndexArray" BeginsWith (" fIndexSlice"
48+ tableName.Remove (0 , 11 );
49+ } else {
50+ tableName.Remove (0 , 6 );
51+ }
52+ if (tableName.First (" _" 0 ) {
53+ tableName.Remove (tableName.First (" _"
54+ }
55+ if (tableName.Length () == 0 ) {
56+ return removeVersionSuffix (treeName);
57+ }
58+ tableName.Remove (tableName.Length () - 1 ); // remove s
59+ tableName.ToLower ();
60+ tableName = " O2"
61+ // printf("%s --> %s\n", branchName, tableName.Data());
62+ return tableName;
63+ }
64+
2765// AOD merger with correct index rewriting
2866// No need to know the datamodel because the branch names follow a canonical standard (identified by fIndex)
2967int main (int argc, char * argv[])
@@ -191,6 +229,7 @@ int main(int argc, char* argv[])
191229 // register index and connect VLA columns
192230 std::vector<std::pair<int *, int >> indexList;
193231 std::vector<char *> vlaPointers;
232+ std::vector<int *> indexPointers;
194233 TObjArray* branches = inputTree->GetListOfBranches ();
195234 for (int i = 0 ; i < branches->GetEntriesFast (); ++i) {
196235 TBranch* br = (TBranch*)branches->UncheckedAt (i);
@@ -199,27 +238,41 @@ int main(int argc, char* argv[])
199238 // detect VLA
200239 if (((TLeaf*)br->GetListOfLeaves ()->First ())->GetLeafCount () != nullptr ) {
201240 int maximum = ((TLeaf*)br->GetListOfLeaves ()->First ())->GetLeafCount ()->GetMaximum ();
202- char * buffer = new char [maximum * 8 ]; // assume 64 bit as largest case
203- printf (" Allocated VLA buffer of size %d for branch name %s\n " GetName ());
241+
242+ // get type
243+ static TClass* cls;
244+ EDataType type;
245+ br->GetExpectedType (cls, type);
246+ auto typeSize = TDataType::GetDataType (type)->Size ();
247+
248+ char * buffer = new char [maximum * typeSize];
249+ vlaPointers.push_back (buffer);
250+ printf (" Allocated VLA buffer of length %d with %d bytes each for branch name %s\n " GetName ());
204251 inputTree->SetBranchAddress (br->GetName (), buffer);
205252 outputTree->SetBranchAddress (br->GetName (), buffer);
206- vlaPointers.push_back (buffer);
207- }
208253
209- if (branchName.BeginsWith (" fIndex"
210- // Syntax: fIndex<Table>[_<Suffix>]
211- branchName.Remove (0 , 6 );
212- if (branchName.First (" _" 0 ) {
213- branchName.Remove (branchName.First (" _"
254+ if (branchName.BeginsWith (" fIndexArray"
255+ for (int i = 0 ; i < maximum; i++) {
256+ indexList.push_back ({reinterpret_cast <int *>(buffer + i * typeSize), offsets[getTableName (branchName, treeName)]});
257+ }
214258 }
215- branchName.Remove (branchName.Length () - 1 ); // remove s
216- branchName.ToLower ();
217- branchName = " O2"
259+ } else if (branchName.BeginsWith (" fIndexSlice"
260+ int * buffer = new int [2 ];
261+ vlaPointers.push_back (reinterpret_cast <char *>(buffer));
262+
263+ inputTree->SetBranchAddress (br->GetName (), buffer);
264+ outputTree->SetBranchAddress (br->GetName (), buffer);
218265
219- indexList.push_back ({new int , offsets[branchName.Data ()]});
266+ indexList.push_back ({buffer, offsets[getTableName (branchName, treeName)]});
267+ indexList.push_back ({buffer + 1 , offsets[getTableName (branchName, treeName)]});
268+ } else if (branchName.BeginsWith (" fIndex" EndsWith (" _size"
269+ int * buffer = new int ;
270+ indexPointers.push_back (buffer);
220271
221- inputTree->SetBranchAddress (br->GetName (), indexList.back ().first );
222- outputTree->SetBranchAddress (br->GetName (), indexList.back ().first );
272+ inputTree->SetBranchAddress (br->GetName (), buffer);
273+ outputTree->SetBranchAddress (br->GetName (), buffer);
274+
275+ indexList.push_back ({buffer, offsets[getTableName (branchName, treeName)]});
223276 }
224277 }
225278
@@ -266,8 +319,8 @@ int main(int argc, char* argv[])
266319
267320 delete inputTree;
268321
269- for (const auto & idx : indexList ) {
270- delete idx. first ;
322+ for (auto & buffer : indexPointers ) {
323+ delete[] buffer ;
271324 }
272325 for (auto & buffer : vlaPointers) {
273326 delete[] buffer;
@@ -289,15 +342,21 @@ int main(int argc, char* argv[])
289342 }
290343 }
291344
345+ // set to -1 to identify not found tables
346+ for (auto & offset : offsets) {
347+ offset.second = -1 ;
348+ }
349+
292350 // update offsets
293351 for (auto const & tree : trees) {
294- offsets[tree.first ] = tree.second ->GetEntries ();
352+ offsets[removeVersionSuffix ( tree.first . c_str ()) ] = tree.second ->GetEntries ();
295353 }
296354
297355 // check for not found tables
298- for (auto const & offset : offsets) {
299- if (trees. count ( offset.first ) == 0 ) {
356+ for (auto & offset : offsets) {
357+ if (offset.second < 0 ) {
300358 printf (" ERROR: Index on %s but no tree found\n " first .c_str ());
359+ offset.second = 0 ;
301360 }
302361 }
303362
0 commit comments