Skip to content

Commit

Permalink
Merge pull request #3268 from cms-sw/filtereffcheck
Browse files Browse the repository at this point in the history
filter efficiency from fragment and from generator field consistency …
  • Loading branch information
efeyazgan authored Sep 30, 2022
2 parents 32b1e76 + 3343be2 commit 405f18f
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions bin/utils/request_fragment_check.py
Original file line number Diff line number Diff line change
Expand Up @@ -632,10 +632,11 @@ def root_requests_from_ticket(ticket_prepid, include_docs=False):
if (cross_section_fragment):
cross_section_fragment=cross_section_fragment[0]
cross_section_fragment = re.findall('\((.*?)\)',cross_section_fragment)[0]
filter_eff_fragment = re.findall('filterEfficiency.*?\S+\S+',data_f2)
if (filter_eff_fragment):
filter_eff_fragment=filter_eff_fragment[0]
filter_eff_fragment = re.findall('\((.*?)\)',filter_eff_fragment)[0]
# filter_eff_fragment = re.findall('filterEfficiency.*?\S+\S+',data_f2)
# if (filter_eff_fragment):
# filter_eff_fragment=filter_eff_fragment[0]
# filter_eff_fragment = re.findall('\((.*?)\)',filter_eff_fragment)[0]
# print("Filter efficiency in the fragment ="+ str(filter_eff_fragment))
print("Cross section in the fragment =" + str(cross_section_fragment) +" pb")
print("Cross section from generator parameters field = "+str(cross_section)+" pb")
if str(cross_section_fragment).isdigit() is False:
Expand All @@ -646,11 +647,11 @@ def root_requests_from_ticket(ticket_prepid, include_docs=False):
print("[ERROR] Cross section in the generator parameters field and the one in the fragment do not match!")
error += 1
print("")
print("Filter efficiency in fragment =" + str(filter_eff_fragment))
# print("Filter efficiency in fragment =" + str(filter_eff_fragment))
print("Filter efficiency from generator parameters field = "+str(filter_eff))
if filter_eff_fragment and filter_eff and int(ext) == 0 and float(filter_eff_fragment) != float(filter_eff):
print("[ERROR] Filter efficiency in the generator parameters field and the one in the fragment do not match!")
error += 1
# if filter_eff_fragment and filter_eff and int(ext) == 0 and float(filter_eff_fragment) != float(filter_eff):
# print("[ERROR] Filter efficiency in the generator parameters field and the one in the fragment do not match!")
# error += 1

# Extension compatibility
if int(ext) > 0:
Expand Down

0 comments on commit 405f18f

Please sign in to comment.