Merge pull request #16819 from hroskes/fix-preexisting-validation

bugfix in all in one validation tool
cms-sw · Jan 19, 2017 · 599e5f5 · 599e5f5
2 parents 1986902 + 08cfbf0
commit 599e5f5
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/Alignment/OfflineValidation/python/TkAlAllInOneTool/betterConfigParser.py b/Alignment/OfflineValidation/python/TkAlAllInOneTool/betterConfigParser.py
@@ -135,7 +135,7 @@ def getCompares( self ):
                                 knownSimpleOptions = ["levels", "dbOutput","moduleList","modulesToPlot","useDefaultRange","plotOnlyGlobal","plotPng",
                                                       "dx_min","dx_max","dy_min","dy_max","dz_min","dz_max","dr_min","dr_max","rdphi_min","rdphi_max",
                                                       "dalpha_min","dalpha_max","dbeta_min","dbeta_max","dgamma_min","dgamma_max",
-                                                      "jobmode", "3DSubdetector1", "3Dubdetector2", "3DTranslationalScaleFactor"])
+                                                      "jobmode", "3DSubdetector1", "3Dubdetector2", "3DTranslationalScaleFactor", "jobid"])
                 levels = self.get( section, "levels" )
                 dbOutput = self.get( section, "dbOutput" )
                 compares[section.split(":")[1]] = ( levels, dbOutput )

diff --git a/Alignment/OfflineValidation/python/TkAlAllInOneTool/genericValidation.py b/Alignment/OfflineValidation/python/TkAlAllInOneTool/genericValidation.py
@@ -23,9 +23,11 @@ def __init__(self, valName, alignment, config, valType,
         self.filesToCompare = {}
         self.config = config
 
-        defaults = {"jobmode":      self.general["jobmode"],
+        defaults = {
+                    "jobmode":      self.general["jobmode"],
                     "cmssw":        os.environ['CMSSW_BASE'],
-                    "parallelJobs": "1"
+                    "parallelJobs": "1",
+                    "jobid":        "",
                    }
         defaults.update(addDefaults)
         mandatories = []
@@ -47,6 +49,14 @@ def __init__(self, valName, alignment, config, valType,
                    +str(maximumNumberJobs)+" exceeded!!!")
             raise AllInOneError(msg)
 
+        self.jobid = self.general["jobid"]
+        if self.jobid:
+            try:  #make sure it's actually a valid jobid
+                output = getCommandOutput2("bjobs %(jobid)s 2>&1"%self.general)
+                if "is not found" in output: raise RuntimeError
+            except RuntimeError:
+                raise AllInOneError("%s is not a valid jobid.\nMaybe it finished already?"%self.jobid)
+
         self.cmssw = self.general["cmssw"]
         badcharacters = r"\'"
         for character in badcharacters:

diff --git a/Alignment/OfflineValidation/python/TkAlAllInOneTool/preexistingValidation.py b/Alignment/OfflineValidation/python/TkAlAllInOneTool/preexistingValidation.py
@@ -20,7 +20,7 @@ def __init__(self, valName, config, valType,
         self.config = config
         self.filesToCompare = {}
 
-        defaults = {"title": self.name, "jobid": ""}
+        defaults = {"title": self.name}
         defaults.update(addDefaults)
         mandatories = ["file", "color", "style"]
         mandatories += addMandatories
@@ -35,14 +35,6 @@ def __init__(self, valName, config, valType,
             msg = "The characters '|', '\"', and ',' cannot be used in the alignment title!"
             raise AllInOneError(msg)
 
-        self.jobid = self.general["jobid"]
-        if self.jobid:
-            try:  #make sure it's actually a valid jobid
-                output = getCommandOutput2("bjobs %(jobid)s 2>&1"%self.general)
-                if "is not found" in output: raise RuntimeError
-            except RuntimeError:
-                raise AllInOneError("%s is not a valid jobid.\nMaybe it finished already?"%self.jobid)
-
         self.filesToCompare[GenericValidationData.defaultReferenceName] = \
             self.general["file"]
 

diff --git a/Alignment/OfflineValidation/scripts/validateAlignments.py b/Alignment/OfflineValidation/scripts/validateAlignments.py
@@ -174,6 +174,9 @@ def runJob( self ):
             log = ">             " + self.validation.name + " is already validated."
             print log
             return log
+        else:
+            if self.validation.jobid:
+                print "jobid {} will be ignored, since the validation {} is not preexisting".format(self.validation.jobid, self.validation.name)
 
         general = self.__config.getGeneral()
         log = ""