Merge pull request cms-sw#35394 from srimanob/121_FixHiMixNoPUString

Fix string when HiMixNoPU is used in relvals
trackreco · Sep 24, 2021 · 3ca3e8a · 3ca3e8a
2 parents 7c3f222 + bea21cf
commit 3ca3e8a
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/Configuration/PyReleaseValidation/python/MatrixInjector.py b/Configuration/PyReleaseValidation/python/MatrixInjector.py
@@ -468,11 +468,14 @@ def prepare(self, mReader, directories, mode='init'):
                             if 'pileup' in chainDict['nowmTasklist'][-1]['nowmIO']:
                                 chainDict['nowmTasklist'][-1]['MCPileup']=chainDict['nowmTasklist'][-1]['nowmIO']['pileup']
                             if '--pileup ' in s[2][index]:      # catch --pileup (scenarion) and not --pileup_ (dataset to be mixed) => works also making PRE-MIXed dataset
+                                pileupString = s[2][index].split()[s[2][index].split().index('--pileup')+1]
                                 processStrPrefix='PU_'          # take care of pu overlay done with GEN-SIM mixing
-                                if (  s[2][index].split()[  s[2][index].split().index('--pileup')+1 ]  ).find('25ns')  > 0 :
+                                if pileupString.find('25ns')  > 0 :
                                     processStrPrefix='PU25ns_'
-                                elif   (  s[2][index].split()[  s[2][index].split().index('--pileup')+1 ]  ).find('50ns')  > 0 :
+                                elif pileupString.find('50ns')  > 0 :
                                     processStrPrefix='PU50ns_'
+                                elif 'nopu' in pileupString.lower():
+                                    processStrPrefix=''
                             if 'premix_stage2' in s[2][index] and '--pileup_input' in s[2][index]: # take care of pu overlay done with DIGI mixing of premixed events
                                 if s[2][index].split()[ s[2][index].split().index('--pileup_input')+1  ].find('25ns')  > 0 :
                                     processStrPrefix='PUpmx25ns_'