DCube improvements

• Improve setup of output directory.
  • Copy files needed for PHP web display into DCubeServer subdirectory. These are now available from share/DCubeServer installed as part of this package (previously were in DCubeServer SVN package), and selected as default of -s option.
  • Only write PHP files if plots created (-p option)
  • Output XML file can now be specified by its directory, eg. -x dir writes to dir/dcube.xml.
  • dcube.log written to output directory by default, so it is accessible from the web.
• Default dcube.py --branch --cmtconfig --install --project --jobId options from environment (asetup and ArtJobName). Defaults with --generate remain "*" so the XML file matches any config.
  • Do not fail if unrecognised values specified (unless --checkKnown).
  • Don't exit if --branch="" etc.
  • Repurpose "Install" tag to show the "Release". --release is now a symonym for --install.
• Allow mon and ref object names to be specified in config.
  • Specify XML attributes, mon="/dir/hist" and/or ref="dir2/hist". Default is mon=name (in current TDirectory) and ref=mon, as before.
  • "dcube.py --generate --flat" generates an XML config with flat structure in a single TDirectory, specifying the full 'mon' path for each plot. This might be simpler for editing, but lists all together in the "Normal view" (simpler, but could lead to confusion if there are duplicate names).
• Don't write debug/info messages on the console (except for RUN SUMMARY).
  • Options -v and -q for more or less verbose console output.
  • Improve some warning/error messages.
• Return $?=1 if test failure (mismatch), $?=2 if warning.
• Improve caption box spacing.
  • Caption box size fits text better. Don't show missing items (eg. jobId).
• Fix Python3 crash for Chi2TestX.
• Bump DCube version to 5.0. Previously was 4.66920 with old SVN rev/date.

Tools/DCubeClient/python/DCubeApp.py

@@ -327,21 +327,34 @@ class DCubeApp( DCubeObject ):
                 else:
 
                     if child.hasAttribute("name"):
-                        objName = child.getAttribute("name")
+                        if child.hasAttribute("mon"):
+                            objName = child.getAttribute("mon")
+                        else:
+                            objName = child.getAttribute("name")
+                        if child.hasAttribute("ref"):
+                            refName = child.getAttribute("ref")
+                        else:
+                            refName = objName
                         objTests = child.getAttribute("tests").split(",")
 
                         if path == "/":
                             objPath = objName
+                            refPath = refName
+                        else:
+                            objPath = os.path.normpath( os.path.join(path, objName) )
+                            refPath = os.path.normpath( os.path.join(path, refName) )
+                        if objPath == refPath:
+                            self.info("test %s '%s' [%s]" % (tagName, objPath, ",".join(objTests)))
                         else:
-                            objPath = os.path.join(path, objName)
-                        self.info("test %s '%s' [%s]" % (tagName, objPath, ",".join(objTests)))
+                            self.info("test %s '%s' vs '%s' [%s]" % (tagName, objPath, refPath, ",".join(objTests)))
 
                         # objPath is type unicode in Python2, which isn't recognised by TFile.Get().
                         # Not a problem with Python3.
                         if not isinstance(objPath,str):
                             objPath = objPath.encode('ascii', 'ignore')
+                            refPath = refPath.encode('ascii', 'ignore')
 
-                        refObj = self.refTFile.Get(objPath)
+                        refObj = self.refTFile.Get(refPath)
                         monObj = self.monTFile.Get(objPath)
 
                         status.append(self.tester.test(child, monObj, refObj))