Skip to content

Added method to test if a given BC is in one of the BC ranges #8938

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
jgrosseo merged 3 commits into from
May 24, 2022
+47 −28
Merged

Added method to test if a given BC is in one of the BC ranges #8938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
31d03b7
Extend bcRanges with method to test if a given BC is in one of the BC…
pbuehler May 23, 2022
cd9a4ad
Do not print columns of type o2::soa::Marker.
pbuehler May 24, 2022
a3ebfda
Remove trailing spaces
pbuehler May 24, 2022
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
14 changes: 14 additions & 0 deletions DataFormats/Reconstruction/include/ReconstructionDataFormats/BCRange.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,20 @@ struct bcRanges {
}
}

// check if the value index is in a range
// and return true if this is the case
bool isInRange(uint64_t index)
{
// make sure that the list is merged
merge(false);

// find the range in which the value index falls
auto range = std::find_if(mbcRangesList.begin(), mbcRangesList.end(), [index](limits a) {
return (index >= a.first) && (index <= a.second);
});
return (range != mbcRangesList.end());
}

// get BC range
auto operator[](int index)
{
Expand Down
61 changes: 33 additions & 28 deletions scripts/datamodel-doc/ALICEO2includeFile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,16 +182,21 @@ def print(self):

def printHTML(self):
cn2u = fullDataModelName(self.nslevel, self.cname)
cn2u = cn2u.replace(":collision",":&zwnj;collision")
# replace < by &lt; and > by &gt;
ty2u = self.type.replace("<","&lt;").replace(">","&gt;")
print(" <tr>")
print(" <td>"+cn2u+"</td>")
print(" <td>"+columnTypes(1)[self.kind]+"</td>")
print(" <td>"+self.gname+"</td>")
print(" <td>"+ty2u+"</td>")
print(" <td>"+self.comment+"</td>")
print(" </tr>")

# some columns don't need to be printed
cols2Skip = [ "o2::soa::Marker" ]
if not any(cn2u.startswith(word) for word in cols2Skip):
cn2u = cn2u.replace(":collision",":&zwnj;collision")
# replace < by &lt; and > by &gt;
ty2u = self.type.replace("<","&lt;").replace(">","&gt;")
print(" <tr>")
print(" <td>"+cn2u+"</td>")
print(" <td>"+columnTypes(1)[self.kind]+"</td>")
print(" <td>"+self.gname+"</td>")
print(" <td>"+ty2u+"</td>")
print(" <td>"+self.comment+"</td>")
print(" </tr>")


# .............................................................................
# holds a table
Expand Down Expand Up @@ -335,9 +340,9 @@ def __init__(self, dmname, CErelation, hfile, initCard=None):
self.defines = list()
self.namespaces = list()
self.categories = list()

# set some variables
self.O2path = ""
self.O2path = ""
self.O2Physicspath = ""
self.O2href = ""
self.O2Physicshref = ""
Expand Down Expand Up @@ -373,15 +378,15 @@ def __init__(self, dmname, CErelation, hfile, initCard=None):
tmp = initCard.find("O2general/delimJoins")
if tmp != None:
self.delimJoins = tmp.text.strip()

# read the file
lines_in_file = file.readlines()
content = O2DMT.pickContent(lines_in_file)

# parse datamodel
self.parseContent(hfile, content, "", self)
# self.synchronize()

# extract the categories definition
def setTableCategories(self, DMxml):

Expand Down Expand Up @@ -580,7 +585,7 @@ def printSingleTable(self, tabs, uses, tab2u):
else:
href2u = self.O2href
path2u = self.O2path

hf2u = O2DMT.block(tab2u.hfile.split(path2u)[
1:], False).strip().lstrip("/")
print(" <div>")
Expand Down Expand Up @@ -631,20 +636,20 @@ def printSingleTable(self, tabs, uses, tab2u):

# print the table footer
tab2u.printFooterHTML()


def printTables(self, DMtype, tabs, uses, CER, tabs2u):
print("")
print("#### ", CER[2])

# add source code information if available
if "O2Physics" in CER[0]:
href2u = self.O2Physicshref
path2u = self.O2Physicspath
else:
href2u = self.O2href
path2u = self.O2path

if DMtype == 1:
if href2u != "":
print("Code file: <a href=\""+href2u+"/"+CER[0].split(path2u)[1] +
Expand All @@ -654,14 +659,14 @@ def printTables(self, DMtype, tabs, uses, CER, tabs2u):

tabInCat = list()
others = list()
if DMtype == 0:
if DMtype == 0:
# pattern for table versions
vPattern = self.initCard.find('O2general/TableVersionPattern')
if vPattern == None:
vPattern = "_\d\d\d$"
else:
vPattern = vPattern.text.strip()

# Analyze the tables and categories
tabInCat = [False]*len(tabs2u)
for cat in self.categories:
Expand All @@ -681,14 +686,14 @@ def printTables(self, DMtype, tabs, uses, CER, tabs2u):

print("<div>")
print("")

# loop over all table categories
if DMtype == 0:
for cat in self.categories:
txt2print = '<h4 id="cat_'+cat.name+'">'+cat.name+'</h4>'
print(txt2print)
print("<div>")

# print tables of of given category
for tname in cat.members:
for tab in tabs2u:
Expand All @@ -697,7 +702,7 @@ def printTables(self, DMtype, tabs, uses, CER, tabs2u):
self.printSingleTable(tabs, uses, tab)
continue
print("</div>")

# print non-categorized tables
if len(others) > 0:
print('<h4 id="cat_Others">Others</h4>')
Expand All @@ -706,7 +711,7 @@ def printTables(self, DMtype, tabs, uses, CER, tabs2u):
print()
self.printSingleTable(tabs, uses, tabs2u[i])
print("</div>")

else:
# print all tables of given producer
for tab in tabs2u:
Expand Down Expand Up @@ -737,7 +742,7 @@ def printHTML(self):
# only one Main CER should be available
if len(CER2u) != 1:
sys.exit('<datamodel.printHTML> Exacly 1 DataModel of type Main is expected. We found '+len(CER2u)+'! EXIT -->')

for CER in CER2u:
inds = [i for i, x in enumerate(tabs) if CER in x.CErelations]
tabs2u = [tabs[i] for i in inds]
Expand Down Expand Up @@ -804,7 +809,7 @@ def printHTML(self):
# remove the version id from the table name

def baseTableName(vtname, vPattern):

vres = re.compile(vPattern).search(vtname)
if vres:
return vtname[0:vres.start()]
Expand Down Expand Up @@ -1154,11 +1159,11 @@ class tableCategory:
def __init__(self, catName, catMembers):
self.name = catName
self.members = catMembers

def blongsTo(self, tableName):
if tableName in catMembers:
return true
else:
return false

# -----------------------------------------------------------------------------