Fix track splitting for 74X and parallel job merge

cms-sw · Jun 12, 2015 · 5cc0b92 · 5cc0b92
1 parent ea50586
commit 5cc0b92
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/Alignment/OfflineValidation/python/TkAlAllInOneTool/trackSplittingValidation.py b/Alignment/OfflineValidation/python/TkAlAllInOneTool/trackSplittingValidation.py
@@ -65,8 +65,8 @@ def appendToMerge( self, validationsSoFar = "" ):
         """
         repMap = self.getRepMap()
 
-        parameters = " ".join(os.path.join("root://eoscms//eos/cms",file) for file in repMap["resultFiles"])
+        parameters = " ".join(os.path.join("root://eoscms//eos/cms", file.lstrip("/")) for file in repMap["resultFiles"])
 
-        mergedoutputfile = os.path.join("root://eoscms//eos/cms",repMap["finalResultFile"])
+        mergedoutputfile = os.path.join("root://eoscms//eos/cms", repMap["finalResultFile"].lstrip("/"))
         validationsSoFar += "hadd %s %s\n" % (mergedoutputfile, parameters)
         return validationsSoFar
diff --git a/Alignment/OfflineValidation/python/TkAlAllInOneTool/trackSplittingValidationTemplates.py b/Alignment/OfflineValidation/python/TkAlAllInOneTool/trackSplittingValidationTemplates.py
@@ -141,7 +141,9 @@
 
 ### Now adding the construction of global Muons
 # what Chang did...
-process.load("Configuration.StandardSequences.ReconstructionCosmics_cff")
+#   In 74X it no longer works if ReconstructionCosmics is imported
+#   Results in 73X are identical with or without it so it seems safe to remove
+#process.load("Configuration.StandardSequences.ReconstructionCosmics_cff")
 
 process.cosmicValidation = cms.EDAnalyzer("CosmicSplitterValidation",
 	ifSplitMuons = cms.bool(False),