Merge pull request #33882 from kpedro88/Phase2-WF73

avoid accidentally choosing matrix types with similar names
cms-sw · May 28, 2021 · 274a32b · 274a32b
2 parents 82d7061 + f8b4542
commit 274a32b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Configuration/PyReleaseValidation/python/MatrixReader.py b/Configuration/PyReleaseValidation/python/MatrixReader.py
@@ -319,7 +319,7 @@ def showRaw(self, useInput, refRel=None, fromScratch=None, what='all',step1Only=
 
             self.reset(what)
 
-            if self.what != 'all' and not any(el in matrixFile for el in self.what.split(",")):
+            if self.what != 'all' and not any('_'+el in matrixFile for el in self.what.split(",")):
                 print("ignoring non-requested file",matrixFile)
                 continue
 
@@ -495,7 +495,7 @@ def createWorkFlows(self, fileNameIn):
     def prepare(self, useInput=None, refRel='', fromScratch=None):
 
         for matrixFile in self.files:
-            if self.what != 'all' and not any(el in matrixFile for el in self.what.split(",")):
+            if self.what != 'all' and not any('_'+el in matrixFile for el in self.what.split(",")):
                 print("ignoring non-requested file",matrixFile)
                 continue
             if self.what == 'all' and not self.filesDefault[matrixFile]: