Skip to content
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

Jump to bottom

fix preexisting tracker alignment validation #22799

Merged
merged 2 commits into from Apr 4, 2018
Merged

fix preexisting tracker alignment validation #22799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19181b0
fix preexisting validation
hroskes Mar 29, 2018
d974e98
and another fix
hroskes Mar 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions Alignment/OfflineValidation/python/TkAlAllInOneTool/preexistingValidation.py
View file
Open in desktop
@@ -1,7 +1,7 @@
import os
from genericValidation import GenericValidation, GenericValidationData
from geometryComparison import GeometryComparison
from helperFunctions import getCommandOutput2, parsecolor, parsestyle
from helperFunctions import boolfromstring, getCommandOutput2, parsecolor, parsestyle
from monteCarloValidation import MonteCarloValidation
from offlineValidation import OfflineValidation
from plottingOptions import PlottingOptions
Expand Down Expand Up @@ -31,7 +31,7 @@ def __init__(self, valName, config):
if "|" in self.title or "," in self.title or '"' in self.title:
msg = "The characters '|', '\"', and ',' cannot be used in the alignment title!"
raise AllInOneError(msg)
self.needsproxy = bool(int(self.general["needsproxy"]))
self.needsproxy = boolfromstring(self.general["needsproxy"], "needsproxy")
self.jobid = self.general["jobid"]
if self.jobid:
try: #make sure it's actually a valid jobid
Expand Down
2 changes: 1 addition & 1 deletion Alignment/OfflineValidation/scripts/validateAlignments.py
View file
Open in desktop
Expand Up @@ -297,7 +297,7 @@ def createMergeScript( path, validations, options ):
for validation in validations:
for referenceName in validation.filesToCompare:
validationtype = type(validation)
if isinstance(validationtype, PreexistingValidation):
if issubclass(validationtype, PreexistingValidation):
#find the actual validationtype
for parentclass in validationtype.mro():
if not issubclass(parentclass, PreexistingValidation):
Expand Down